Getting ready to upgrade to Atmos

[antimatter]

Hello people,
I am getting ready to upgrade my system to handle Atmos & X. I just was looking for some in put on what I am thinking of going with. I was going to grab the Pioneer elite Sc-95. I was also just grab the monoprice non logo amp at I think it was 100 or 150 per channel (2) for my fronts. My system is currently bic acoustitech newer pl-980s and surround pl-66. I was thinking of adding 4 more pl-66 for my heights. The other option is I have 4 infinity bookshelf infinity 363 or 362 I'm not sure they are with a system I do not use as much. What is your guys opinion on how I should handle this. Intergrate the infinity as either height or surrounds or keep everything matching? Also I'm pretty much sold on the pioneer but opinions and recommendations welcome on that as well.
Thank you,
Jay H.