I think you have plenty of options as detailed above. My money would go on 252/Supercap DR. Don’t automatically assume a better power amp helps bass, the improved pre will give you more definition and bass quality.
My experience with the 252 was that you need the DR Supercap to really maximise its potential. Non DR convinced me less