I'd just go for the 590s at the current sales price. The 520 I have but have replaced in my 590/580/530 system with an Infinity 3-way (RC263). I'm still using the 520 but in a different system.
Boomy bass could be for a few reasons, what sub are you using and how did you choose placement, how did you integrate, etc.