You should absolutely carry a tube and patch kit, and the tools needed to change a tube out.
I would highly recommend wider tires. Can you fit anything larger than 25mm? I'd go as wide as you can, maybe you can fit 32mm. If those don't fit, I would at least do 28's.