Oh dear, what a complete mess. How can a professional not spot this for a 2nd time?
Wow... it is hard to believe. However, this is a slightly easier problem to fix in your system. Using "large" for all your speakers, and then flicking the sub polarity switch (or knob) should do the trick.