More than likely you can get by with LESS pump, rather than more. Most pool builders oversize pumps. What you need to know is how many suction side inlets do you have and how big are the pipes, how many returns do you have and how big are the pipes. Also, unless your solar is on a 2nd story, you really don't need to upsize the pump for solar. Poolplaza.com has good pump info, I have not bought from them, but the website is really informative.

Living in CA, you should look at getting a 2 speed or multi-speed pump. If they aren't already required, they are going to be soon. You should be able to get a significant kickback from your electric company for installing an approved pump (call them before buying anything).