It's never too late.
Sunfire Amp + Pre-Pro sounds good to me.
Give it a few months and keep an eye on a Sunfire Pre-Pro.
You can either sell the Elite AVR on Craigslist.com (local) or eBay. I've sold around 18 items on eBay! It's pretty simple.
You could wait a while for Sunfire to come out with a HDMI 1.3/TrueHD/DTS-MA pre-pro or just get the current model and let your blu-ray player/dvd player do all the decoding.
And after you get your BD player, you can also sell your current DVD player if you want. Or not.
Oh wait, but the current model Sunfire pre-pro doesn't have all those nice features like the Elite, does it?