AV and stereo room - How to combine ?

[Dolby]

How do you guys blur these two rooms, assuming you have both?
One system doing both AVR and HT?
A preamp with HT bypass?
Two rooms?

These are my thoughts and something I'm going to look at. Currently I have :

Speakers
2 x Elac 407 Mains
1 x MA Silver Centre
2 x MA MA Silver Rears

Electronics :
Emotiva UMC200 HT processor
Emotiva XPA-5 5ch amplifier
Sonos Z90 for Tidal
PS4

I'm thinking of going more high end on the stereo, and more low end / modern on the home theatre by selling off and kinda starting fresh :

Yamaha RXV581 amplifier with HDMI 2.0a and handles HDR for the PS4 - currently I run direct to the TV
5.1 cheapish on-wall speakers (ie small Goldenear)
Electrocompaniet ECi3 to use with the Elac
Evenually, a Bluesound Node 2 for Tidal MQA to replace Sonos

My thinking is a single room to house both - am I missing anything ?

 

[PAPPA3]

 

[Dolby]

 

[Drifter]

 

[Dolby]

 

[Drifter]

 

[Coach]

 

[Dolby]

 

[adie]

 

[Maxfly1]

 

[Dolby]

 

[Danny Boy]

 

[adie]

 

[croak]

 

[Dolby]