E.F.
Babylegs! They are darling and will do the trick. We used them, and my son still wears them on spring/fall days that are cold in the morning but warm in the afternoon. I just stick them under his shorts and they work great. Inspired by Finn is the cheapest place to get them, I think, and the are having a huge moving sale right now.