Sorry, I was out of town when you posted this. Are the naps still going well now? I didn't think Alec would ever learn to go back to sleep on his own once he woke, but he does it regularly now- especially since he's down to one nap a day. Today he woke after an hour, but after less than 5 minutes of crying, went to sleep for another 40 minutes.
He is in his crib the entire allotted time each day, as long as he isn't sick. (With one nap, it's 90 minutes, but he knows to go back to sleep now.) The few times I got him up right when he cried, he was crankier and continued the crying after being out of the crib. When he would wake early and I allowed him to cry for the rest of the allotted time, he would at least get the crying out of his system and was happier when I got him up.
Don't know if this helps, but thought I would put it out there anyway

.