That is a nice system that you have already, with $400 upgrade, I think it is going to be minor. I would save it up to wait for a major upgrade.
But I like the California Audio on your list. Good luck!
But I like the California Audio on your list. Good luck!