I also have a headphone rig. I did have a Marantz SA-14 SACD player until yesterday. I also have the Sony 222ES SACD changer (modified -- you might look into doing that) in my main system and compared it to the SA-14. I preferred the SA-14 by a small margin. I replaced the SA-14 with a Resolution Audio Opus 21 (no SACD) last night and I love it! I just decided I was tired of SACD players that aren't great with redbook.
I have the Grace 901 headphone amp which you might look into someday. It's real sweet, but pricey. I use 3 vibrapods under it and this makes a small improvement (but the my floor is bouncy). And surely you've heard of the Sennheiser HD600s. Different sound that the Grados (I prefer the HD600s). One nice thing about the HD600s is you can use aftermarket cables for them. I use the Stefan AuioArt Equinox cables. Finally, I use Audience Au24 interconnects (I really like them, have them all over my main system), Audience PowerChords (I think the 222ES powercord is fixed, correct?), and a Blue Circle Music Ring "power conditioner" thingy.
I sorta went all out in this system, but it is a real treat and gets you intimately involved in the music. It's my escape when I'm stressed or just want to drift for awhile.

