Wow, changing rooms is indeed a call for changing speakers.
As you, I also think matching the speakers to the room is very important. And TWO subs, now that should be excellent. Besides "stereo bass" which I'm not sure exists at lower freqs, two subwoofers will allow infinitely more flexible bass loading than one sub. Every room has standing waves, and smaller rooms have more of them at more frequencies. So by wiggling around the two subs, one should be able to reduce many of the problems.
I'm sure you know all of this, as your plan indicates. Just thought I'd mention it in case other folks are reading and wondering, as I did for a very long time, "Should I get one REALLY good sub, or two pretty good subs". Of course, if you can justify/afford two really good subs, then you're the KING!
As for your quest for monitors, here's to hoping you enjoy the hunt and the eventual change. I do think that all of the speakers you mentioned will be a dramatic upgrade in mids and highs.
Oh yeah, you said:
"I am going to plug the amp into the wall and not the power conditioner and see if it helps any"
Let us know how that turns out. I think we are all playing with power conditioning these days, so any observations like the above will be helpful.