I've had the same issue with the pump falling into the wheel and nearly throwing me off, I've got to say I'm still using the pump (with the barrel dents worked out) and I still carry it on the bike in the same way, only making sure I secure it well each time I replace it...

Please let us know if you do find a better replacement though, especially something that can blow the Stelvio's up to a decent pressure (115psi or thereabouts)