I wonder if the new 1.7 would be a step up from the 3.6, now that it has all QR drivers, which would help make it more coherent. I have not read about a comparison. It also is supposed to have a larger sweetspot. It seems like it would be a better fit for your room too.
It is probably the direction I would go fwiw...
It is probably the direction I would go fwiw...