That's correct. With pumps, you're probably looking at about 28.5 amps.
As far as what's "right" with regards to upgrading, I'm sure you'll get opinions on both sides of the coin. I'm personally in the "a thirty amp feeder is rated for thirty amps" camp. Of course, upgrading to 50A opens up...