DigitalOcean. Databases are much cheaper. No big deal in moving as digital ocean app platform supports buildpacks
I've been waiting to make this same move but holding back because DOAP isn't quite as featureful yet, e.g. not supporting scheduled jobs, which for some reason ALL my Heroku-based projects use in some way.
All told I've never looked back after ~7 years of doing this, and while job security can obviously be an issue, the comparative flexibility and freedom over your work/life balance etc more than makes up for it. Good luck!