Great Catrin! I think you did the right thing with the two pump approach. I've had a Blackburn Mammoth for about 10 years and it's still kicking, and now sits on my new MTB. Good choice. And a floor pump is the best way to go for pre-ride setup. If I am driving somewhere to go riding, I take mine in case I discover an issue when I get there.
Take the time to learn how to use a real patch kit (not the ones with the self stick patches like Park, but the one with the tube of glue.) It will save you money to be able to re-use a tube that has a small puncture. If done right, the patch is stronger than the rest of the tube so I have no qualms with using a patched tube. It also give a bit of peace of mind, to know that you have a backup plan on those worst of rides where you get multiple punctures.
As far as "• Bottle Cage (two?)" goes, I have two bottle cages and usually take two bottles, because I tend to drink a lot while riding and the summer here can get quite hot. Also gives me the option to use an energy type drink in the second bottle on longer rides. If I am riding where there are lots of places to replenish I can get by with one bottle but I end up wishing I had the energy drink anyway.
Tzvia- rollin' slow...
Specialized Ruby Expert/mens Bontrager Inform RXL
Specialized SWorks Safire/mens Bontrager Inform RL
Giant Anthem-W XT-XTR/mens Bontrager Inform RXL
Fuji Newest 3 commuter/mens Bontrager Inform RL
Novara E.T.A commuter/mens Bontrager Inform RL