I would recommend the Mountain Morph from Topeak. If you decide on another pump totally fine just get it from an actual bike shop even if it is online, that way you know you are getting legitimate goods.

Would agree on a spare tube always tubeless or not. Patches are really an at home deal to do while relaxed and not stressed out for time. I still carry them with me for an absolute emergency situation but I will go for a tube before patches when I am out and if I am fully prepared I am usually less likely to get a flat in the first place. However when I am not flat city baaaaby.