I would suggest you go with the 302s. The price sounds right and using identical speakers would make for seamless pans and provide timbre matching which is great for either home theatre or multi channel music. By surround speakers did you mean small bookshelves, satellites, or dipole/bipole speakers? If you are thinking dipole/bipole speakers I have a quick warning, they sound great with home theatre, but pretty crappy with music in my experience.
Personally I am a BIG PSB fan. My whole speaker system is PSB and I love it. I recently upgraded my rears to the same model as my fronts and the improvement was very noticable.