I recently replaced my very old tires (23mm on a vintage bike) with some 25mm Pirelli Velo Pzero 4s.
I was shocked at the difference in ride comfort. I can now run the tires at 90psi (as opposed to 110/120psi when i had the 23mm) and the ride quality has improved drastically (and so has speed apparently, but it's still too soon to tell if that's a coincidence or not)
So you should consider a wider tire while you're upgrading them (if it fits the frame)
Tube-wise, I just get whatever generic tubes the LBS has.
Cheers