Where do I go from here?


What I have:
Rotel RB-981 AMP
PrimaLuna Evo 300preamp
VPI Prime Signture turntable
Hana ML low cartridge
Musical Surroundings Phenomena  phono stage (originals model)
B&W CM2 speakers
REL T/7i subwoofer (1)
Heimdall II phono cable
He9mdall II interconnects - phono stage to preamp
Transparent Audio MusicLink Super interconnects (preamp to Amp)
Cardas Neutral Reference speaker cables

So, I understand that my amp and speakers are my weak link- that's pretty clear. But Do I replace my speakers and hope they sound right with the speakers I will buy in 2 years, or vice-versa? Or, should I start with different interconnects between my preamp and amp and ho-e they'll work well with the amp and speakers I buy in the future? It's a conundrum you have lol been through, so, what did you do, what would you do different?
128x128ctwith3
An easy way would be to start with the Amp and hear for yourself.
Existing components are familiar (to you) and of high quality. 
Do a little Homework and decide what you might like to try.
+1 @mijostyn on the CM 2 plus a Sub ... Good!

Given your equipment I believe I would upgrade from the Rotel amplifier. Otherwise possibly the speakers if you are wanting to change the character of your system. Then an amplifier to compliment the new speakers.

If your CM2s with sub are working for you then the amplifier.

One persons opinion. 
Thanks everyone.
Another sub is not something I would have done, it's money that can go into new speakers. The room is 22' x 14', but because of other furniture my system has been relegated to the half of the room where the foyer provides entrance to the living room, with the stairs going up and down and a short wall  (my house is a split level). I can stretch out a little into the space where the foyer and living room meet. I decided to bite the bullet and ordered a pair of Harbeth 30.2 XDs, which are actually coming tomorrow. Next purchase will be a replacement for my Amp, but I think that won't be for a while after the speakers, bathroom remodel, and the upcoming kitchen remodel. My dealer suggested Analysis Plus Silver (I not II) speaker cables, but I may just get my Cardas Neutral Reference bi wires reterminated unless someone grabs them fast on fleabay. Hopefully I can stack the bi wire spades on the terminals and have more time to do research.