Assistance in selecting new speakers…

Welcome advice on selecting a new set of speakers for our “great room” home theater set-up.  We have KEF Reference Model Two (FL, FR) Monitor audio silver (C), and KEF 103.2’s (SL,SR), and Emotiva s12 powered  subwoofer.  Emotiva Xmc2 processor, Rotel RB-985 multi-channel amp.  The room dimensions are 17’ x 25’ with vaulted ceilings (~12’ at the peak).   I will likely need to upgrade my amp and possibly my Sub. Priority is  listening to music (except heavy metal and rap) and I have a family who likes to watch movies, so I have to consider this as a close second.  I’ve purchased KEF for the last 25+ years, so that is a factor.  I’m looking at two options for the types of speakers, architectural and free standing, with the trade off being the architectural set-up is a cleaner look, which for a multi-purpose room is desirable, but not at a considerable loss of fidelity. Since I lean toward KEF, I am looking at Ci3160RLM (FL,C,FR), Ci200Rs-THX (SL, SR) for the architectural option, and R7 or R5 (FL, FR), R2 (C), R3 (SL, SR).   I’m not sure about what subwoofer to choose.  My budget is ~ $15K-$20K (including a new Sub and power amp). 

Would appreciate if you could provide advice on what I’m not  considering, what assumptions I’m making which may not be accurate etc.  For example,  in the proposed new set-up could there be a noticeable difference in the fidelity between the architectural speakers and the free standing speakers?   What are alternatives to KEF, whether new/used, e.g., Focal,  which you would recommend I consider?   Any thoughts on a multi-channel amp and subwoofer upgrade?
 

Thanks for your time and consideration.