RV, FWIW I think you are finding a solution to your problem, i.e. sound v music. If you are careful in your choices you may actually prefer using Headphones and a good matching HP amp to your main system when you want to hear the recordings contents unmolested by room acoustics. It can be a big difference! I have HP's and amp and I just love them. I do lose some of the great soundstage but the clarity you can get from a headphone system with a good recording is remarkable and a worthwhile alternative.
Couple of warnings. Be sure to try wearing the headphone you think to buy. Comfort can be a huge issue for listening for any length of time. I have gone thru several HP's with near SOTA sound that were so uncomfortable I couldn't wear them for more than an hour or so. Fatal flaw if you just happen to like Mahler/Bruckner, etc). There are headphones which can sit on your head without pressure from the headband and the earpieces feel comfortable on your ears. You can forget they are even there. As with speakers, your choice of amp and headphones will be synergistic. Be very wary of specific user recommendations (for the same reasons you would other audio stuff). Re headphone amps, tubes are not necessary. I'm a tube addict and have a quality tube HP amp purchased on the assumption that you needed tubes. I also have a solid state HP amp and found that I much prefer it's sound with my planner headphones.
Good luck.....
