So I just completed the speaker upgrade to these:
http://www.ebay.co.uk/itm/Focal-IFBM...item1c92b6395d
Excellent result. Even without changing anything else the difference is remarkable. I had to make some custom spacers to move the speaker out a bit as it is much deeper than the original speakers. Total cost was €225.