Time to step up! Yammy RX-A810/ 1010 and system matched speakers....?

Hi, I've been reading,watching and obsessing about a new AV amp so it's time to ask for your thoughts..

I've had my Onkyo - Mordaunt set up for 5 years and to be honest have found it less than satisfying when playing music.

I have enjoyed it's Cinema performance but have started listening to more music and find it a little tiring.

I'm not enjoying a lack of lower mid in the speakers either, the Onkyo EQ makes little difference to the sound!

As  an audio engineer and have used it to play back tracks to clients mixed in my studio.

I use Focal CMS65's in a treated room with KRK ergo room correction.

So it's important to get a pleasing sound so the client gets an idea outside of the studio and before the essential car!

I've been looking at Yamaha's and with the end of line of the RX-A810-3010 and seemingly short supply of refurbs I thought I'd take the plunge.

Otherwise I'd thought maybe Denon.. although I have a video game job coming up where I may need to use the system to mix surround, so analogue inputs may be essential ( not sure my RME Fireface ADAT optical will work on an AV amp).

Speaker wise I'm pretty open, floor standers may be required as my 4year old plays close to and also listens, thankfully he shares my love of english 70's prog! But a good set of sturdy weighted stands could work if the stand mounting speaker results are worth it.

Monitor Audio BX range may be good as my speakers are now positioned up against the wall ( vain attempt to fill the gap in the MS freq range).

I like the look of the Q Acoustics 2050i's too...

I don't have an unlimited pot so was just going to replace the amp and front speakers now, then the surround later and hopefully keep the sub and centre.  I was hoping to get in under a grand.

Hope your expertise in this realm can halp!

Thanks in advance for your time