Picking the right amp should be based on your personal preference, so i would suggest giving a try to the amp before you pull the trigger.
If it helps, I was in a similar situation when I got my HD800. I loved the sound, the soundstage and the details, but the highs were way too much for my taste. I also have the T1 and the HE-6 (which is very difficult to drive)
Upgrading to v200 helped and I have a sound which I’m very happy with, but if you’re expecting the HD800 to change completely it won’t happen. I added an aftermarket cable and anaxilus mod, but I believe the HD800 is just not made for every type of music. It’s a very picky headphone with the quality of the recordings and the genre of the music, but can give you goose-bumps when the song suits it.