I'll go with that pretty much in that order.

One thing you can do to verify if its ignition switch, is to rock it fore/aft slightly when the dash lights come on. If the pump motor engages again...