If you're planning to carry it inside a frame bag I'd suggest a CO2 inflator.
If you're willing to clamp something alongside a water cage I'd suggest a longer frame pump. Topeak Morph pumps are frequently recommended, and I've got a couple of them which I like, but I think they look a little clunky.
I hate mini-pumps because they take too many strokes to bring a tire up to operating pressure.
__________________
My greatest fear is all of my kids standing around my coffin and talking about "how sensible" dad was.