Totem Tribe III or Martin Logan Voyage or BG Radia R-500? and what Sub? or start fresh?

I'm in a conundrum. I have a listening room system comprised of Revel F50s 
I have winnowed the field down to these 3 speakers for a music-only, 2 (or 2.1) channel system. I have an 11, 340 cubic foot room; 68 feet deep by 12 feet tall. The back half of the room is 12 feet wide, the front half of the room 21 feet wide. The speakers will be centered on the 12' end wall. I would appreciate the convenience and flexibility that an in-wall subwoofer provides, but can live with a floor-stander. My musical tastes span the spectrum from the most delicate solo music to large scale symphonic to headbanging rock and everything in between. Listening levels though are usually low to moderately loud (you know, that volume when your wife comes in the room and turns it down 10-15% more than you want? hate that. but I digress.) I could cannibalize my current system and use a Musical Fidelity A308 Integrated (100% dual mono design with 150w into 8 ohms, 300w into 4 ohms, 48 amps of peak output current, and a damping factor of 140). If I use it, then that leaves a hole to fill in my real listening room which contains Revel F50s.
My other thought is to move the whole kit & kaboodle into the 68 foot room and start a new system in my smaller listening room. I've lived with that system for 6 years and am beginning to get the itch for new and different and better. My ultimate goal is to end up with a system in my listening room that provides state of the art imaging and soundstaging and silent black backgrounds. Tubes maybe. I want the speakers to disappear and for the hairs on the back of my neck to stand up as often as possible. Those moments have become fewer and further between.
What would you learned folks do?