I thought about it more yesterday and ended up ordering the Lezyne Road Drive mini pump and Lezyne Trigger Drive CO2 inflator.

Ice41000 - I was always planning on having at least a mini pump but decided to pull the trigger on a CO2 inflator because as several people have mentioned, being stuck on the side of the road while pumping up your tire isn't fun.

WheresWaldo - I went back and forth on whether to get an inflator that took only threaded cartridges (like the one I ended up ordering) or one that took threaded and unthreaded cartridges (like a Spin Doctor I was looking at) but for as much as I'll need it I don't think the cost will be too high.