OP, thanks for your reply. Honestly, If you are going to move in six months… I would not make any additional purchases. I would wait.
If you were going to remain there I would recommend downsizing your speakers. But moving is going to completely change everything.
I would like to reinforce how incredibly important your listening space is. I lived in small houses for many years… then bought a house with a large incredibly asymmetrical room I am now using for my audio room. Holy cow… biggest upgrade ever!
So, you want to improve your system in the future. Look for a place you can set up a 6 - 9’ triangle for speakers and chair… one where there is nothing in between the speakers and the speakers are away from the front, back and side walls. Think about thick wall hangings for dampening (see my systems under user ID).
if you anticipate rooms similar to what you have now. Then consider getting some small stand mounted speakers like Totem (with a small subwoofer)… natural sounding and punchy… less room dependent than than too large floor standers in a tiny room. Right sizing is key.