I was in your position a couple of months ago and decided to get the Integra Research RDC-7. Great review in both music and movie. The best upgrade program (together with Tag) that I ever heard of. They are shipping with DTS-ES, Pro Logic II, Neo... (their last upgrade) and there is an upgrade coming anytime which will improve bass management (biggest drawback of this pre-pro is the fixed crossover at THX's 60Hz), change some hardware...
Considering that you're a 60% Home Theater guy (like me), I would seriously consider this Pre-Pro. It also has balanced outputs for all channels, 7.1 analog inputs for DVD-A and SACD and great measurements on Stereo music playback...