I have a Jungon JA-88D in my second system. My room is very similiar in size to yours. Since purchasing this integrated, my modded Sonic Frontiers Line One (tube preamp) and Golden Tube Se-40 (80wpc tube monoblocks) have been getting dusty and garnering little attention. I also tried several solid state amps including Luxman and this unit was significantly better than all. I am basically a tube guy, but this integrated gives you a very musical sound somewhere between the two camps. Also, this unit will impress all of your non audiophile friends and they will ask you if it is a Mcintosh.
I also agree with Aball that a decent sub would probably do more for you in the near term than a component switch.
I also agree with Aball that a decent sub would probably do more for you in the near term than a component switch.