Help me match new speakers with my older LC

Options
I have a theater room that has:
Fronts: (2) LSi 25
Center: LSi C
Sides: (2) LC 60i (mounted on ceiling mid-room)
Rears: (2) LC 65 FX (mounted on back wall)
Subwoofers: (2) DSW Pro 500

I am adding 2 or 4 speakers to move from 7.2 to 7.2.2 or 7.2.4 Atmos. I know the LC 60i / LC 65 FX are no longer made, is there a good option for what I can buy today that would be the best match for the existing setup?

For bonus points -- any thoughts on the best room placement for 2/4 more speakers for Atmos given the current 7.2 layout above.