A good baby carry (Ergo, Tula, maitai, etc) are worth their weight in gold. You can carry a baby, handle naps, and go about your life with your hands again.
Also, don't dismiss cloth diapers. I was hesitant to go down this road, but they were surprisingly easy to use and saved money overall (not to mention the amount of diapers we saved from a landfill). The shells on many brand can actually double as swim diapers too.