Amps or Speakers which one to upgrade next

Agree with simao.

You have a pretty well-balanced system right there.  It all depends on what you're trying to achieve, in more specific terms than "better".

That being said, the CMII hits above it's price-bracket, so if it were me, I'd be looking at speakers.  My CMII is hooked up to speakers that list, coincidentally, at 7K (though I paid a good deal less).

Recommendations: define what qualities you want to enhance; read some of the recent speaker threads.  Otherwise people will just give you their recommendation of their favorite.