Well you know what I'd tell you to do. Treat this as the second chance you didn't expect to get, ask for your money back, and stop spending money just cos it's burning a hole in your pocket. It's not five minutes since you bought the 8005 and you can't even nearly have got used to its sound and what it brings to the table over a true extended period of listening.
You don't appear to be upgrading to fix a long-standing niggling issue, other than saying you want better control in the bass. And it's not even as though you're buying something you've heard and you know will work, you're just bolting on bits based on the assurances of a retailer who stands to profit from your purchase.
I'm not trying to be nasty about it; why would I, I have nothing to gain either way. But sometimes it's like you really have to beat someone around the head with a huge placard that has "Stop being a f'kwit" on it in big letters before they'll think twice about making a boo boo.