Jennifer, what is Caeden's temperament? If he's fussing before he goes to sleep it may just be because he's spirited &/or touchy.
Little Bear's Mama and Caroline, have you tried going to your lo's room when they normally wake up (early) from their naps and maybe doing a light pat/shush, something to prevent them from stirring? I know this is something that works for the younger ones but it may help extend the naps for your ds as well. That's what works for my ds when I notice a trend in his waking early from the naps.
Also, have you noticed anything else that works in calming your lo's down or helping get them to sleep? The reason I ask is because the reason pat/shush works for my ds is because I've always done it. Sometimes it riles him up (and he'll let me know) so I stop doing it. Other times it relaxes him. I also have always used white noise (running water) in the background and so I always have that going around the time I expect him to wake up.
Just some suggestions for extending the naps. FYI... the naps do get better as they are established in their 6 months. It's almost as if by magic. So, Caroline, stick to the routine and you should see a change shortly. Little Bear's Mama, you have a couple of weeks to go. ;-)