Unless you're going to go with an Atmos setup, the wide dispersion 402s work really well as surrounds. And, I know we all have limitations based on our rooms but in a 5 speaker surround setup your surrounds are actually your side surrounds, a 7 speaker setup adds rear surrounds.
For the most noticeable upgrade, I'd suggest upgrading your center and adding a second identical sub.