Focal Scala or Diablos with subs?

Hi all,

was looking for some advice discussion regarding a potential upgrade/purchase that I am considering.

I currently own a pair of Focal Diablos which I have had for around 6months. Amplifier is Musical Fidelity AMS Primo pre amp / AMS35P 35w class A amp. Source is Linn Akurate DS streamer.

Room size is fairly small, 4mtr x 4mtr x 2.4mtr ceiling, carpet floor brink render walls. Listening position is about 2.5mtr from the fronts. I also use the Diablos as part of my HT set-up.

I am very happy with the sound quality that the Diablos give me & feel that they suit the size of the room quite well. Synergy with the MF gear is good, the warmth of the a-class amp fits well with the detailed nature of the Focals, nice & silky. At times however I do feel that they lack a little in the bottom end.

Recently had a chance to listen to a pair of Scalas which a local dealer has as trade in, was very impressed. Everything that the Diablos offered and so much more. They will push my budget but with a trade in on the Diablos it can be done (& please don't start talking about the Maestros!!!)

However I have just started using my JL Audio F110 sub with my hifi & I have to say that it has made me stop & think. I can appreciate that the bass is not as tight or as perfectly integrated as the Scalas but it would be a lot cheaper to buy one more sub than stretch for the Scalas. It would also have the added advantage of beefing up the sub section of my HT set-up.

So questions are:
1) Thoughts on comparison of Scalas to Diablos/subs
2) Suitability of Scalas to room size
3) Suitability of Scalas in a HT set-up (I use the same speakers for both)
4) Suitability of AMS35P 35watt class A amp to run the Scalas (won't be able to change the amp any time soon, have been told that it should be more than adequate)

TBH I already feel that the Scalas are the way to go, they pretty much blew me away when I listened to them & I think that the deal I can strike is great value. But interested to get thoughts/advice from those with more experience than myself.