If you're going to bring only one, Pump > CO2, for all the reasons mentioned. There are models that integrate the two together.

Which one? I have a little carbon Topeak that isn't much bigger than a Marks-a-Lot. It will pump to pretty high pressures if you got arms like Popeye.