My calculation of time of battle x DPS failed to consider I wasn't constantly hitting all my shots during the time of battle...
Maybe just limit how many shields can be obtained in one battle? Your other ideas are also good, melee moves in particular I'd like to see.