I'd wait until you're in your new home. With more flexibility in speaker/listening position and the ability to add some aesthetically appealing room treatment, you may be satisfied with what you already have. You would need two subwoofers, not one for proper music reproduction. Trying to get ideal home theatre (articulation of speech) and stereo music reproduction out of one system is always a futile exercise.
If I was in your position and did want to change speakers, amp or both and considering this is a pro audio forum, do what many of the best recording studios in the world do and go with active ATC speakers within your budget.
I knew a professional musician who had a very good Magnapan system in a nice, purpose built, dedicated stereo listening room switch to active ATC speakers.
Finally, regarding fine tuning of your existing components, I strongly recommend getting Jim Smith's $35 book, Get Better Sound. Follow his advice in your new home and you may not need to upgrade anything.