Dusty,
Looked at your system evolution - nice work! Since I suggested you get the CM1's I am compelled to offer suggestions to maximize enjoyment.
1. is your amp still living on the sub? If so, you should take steps to try to isolate if moving to another location is not an option. Try heavy cutting board/wood platform under amp isloated from sub with isoblocks or sorbothane, and with cones or small wood blocks supporting amp on top of platform. Moving to entirely different local still best.
2. preamp. the Onkyo is good piece for 5.1. For 2.1, you will do much better with dedicated pre - even something like used NAD or ADCOM would be an improvement, or even better, an old Conrad Johnson would do the trick.
Thanks for sharing your system and enjoy the new speakers!