Your spare tube should match your tire size printed on the tire sidewall. Comos & Vados have different size tires, so different tubes.
My flat kit includes a spare tube, tire levers, patch kit, tire boot, mini-pump, CO2 inflator with 16g cartridges (1-1/2 cartridges per tire fill), and a cleanup wipe. I also carry a mini-tool which has the hex wrench necessary to remove the Como/Vado through axles for a flat repair. I put talc on all my tubes and store them in zip locks to minimize deterioration.
I've never had a chain fail on a ride so I don't carry a master link on day rides. I do carry more 'stuff' for out of the area rides.
My younger sons have been avid MTBrs since high school so I ended up with a fully equipped home bike shop. I'm probably not the best person to advise on what other tools to get 'cause my answer is usually all of these;
View attachment 65378
There's also a tool chest with smaller tools on the workbench opposite the pegboard, an air compressor on the floor to the right, and a wall-mounted bike stand to the right about a bike length away.