Welcome back to 2 channel!
I did the same thing with HT. I lost interest in it and started building up a 2 channel system with the existing components and slowly replaced/upgraded them. That was a while ago and now I'm enjoying 2 channel more then ever and don't regret leaving HT behind.
Nice system. Tweak suggestions...it's low on the list but maybe a power conditioner/line filter. If your sticking with bookshelf speakers try ProAc.