Amplifier and Speaker Advice needed

A few years ago I sold off my JMLabs electra HT system (7.1). I switched to headphone gear and now am really missing my old set up. Unfortunately, I dont have the money to go that expensive again (not without certain divorce).

Here's my situation:
pre/pro: B&K ref30 (dated, i know)
room: an acoustical nightmare (2 story with open side wall)
room size: ~15 ft x 20 ft

Budget:
$1200 now
+$800 in the next 6 months

Expectations:
The room is terrible, my budget is low, my pre/pro is dates so my expectations are pretty low here. What i need is amp + speaker advice. I can even start with an amp and 2 speakers for now and add more over time. so far ive been looking at a matching B&k amp (admittedly for aesthetics) + quad 12l or totem. Other option I was considering was aragon amp with a pair of small maggies.

Im concerned that I may be setting myself up for disappointment (vs my old JMLabs). Any advice would really be appreciated!

thanks!