Marantz av7005 vs av8801 vs Theta Casablanca


So I recently started upgrading some of my system starting with the speakers. I used to have a full Polk lsim 7 series 7.2 system. I have replaced most the Polk speakers with Legacy Audio, Focus se for the front, Marquis center and the new foundation subwoofer. My current pre amp is the Marantz av7005 with Emotiva xpa-1 gen 2 monoblocks for the front 3 channels, marantz mm7055 for the rears and surround. With the new setup I have found a limitation with the av7005, pro version of Audyssey no longer available. The av7005 does not let me run the front 3 channels, along with surround and back, in full range. I recently came across a deal on both a Theta Casablanca and a av8801, decided to buy both and give them a try. I have several questions. Will the av8801 allow me to run full range with the all of the channels? I believe that the Theta is a gen 1, would it be worth bringing this thing up to a newer configuration? I am still in need of better surround speakers and rears, should I try to keep going on the full range thing, legacy line, or dose anyone have suggestions for these speakers that would match with what I have. And last question, should I add width and or height. Thanks guys.

I should add that I watch lots of movies but also listen two channel. 
paullk
Just another brief update, the av8801 is really growing on me now that I have the room correction figured out. I think the set of speakers I ordered to use as wides will be here today so I'm excited to see what 9.1 will sound like. I can say that the av7005 was great but I didn't like the room correction, this all changes with the av8801. I'm actually thinking about just selling the Theta because I really like all these channels, I'm not sure what it would cost to bring the theta to a 7.1 or a 9.1.
Theta upgrade will be extremely expensive.  You are probably looking at $4,000 to $7,000 to upgrade to latest, depending on which DSP version and DAC boards you need.  If you want 9.1, it's probably over $10k for sure.
Agreed, I think my money is still better spent on the rest of the speakers. Maybe someday I will be at the Theta level. 
The Marantz AV8801 is a very nice pre/pro and a really good 2-ch preamp. I did listen to the AV8802, but quite frankly, I preferred the AV8801. I have since separated by 2ch and my HT, so the 8801 will be sold, just overkill for what I need now