Nap Issues

So today I decided that Tate may be ready to just take 1 nap a day. I think we may try it tomorrow and Sunday and see how it works. Currently Tate wakes up around 7:00 in the morning and goes back down for a morning nap around 9:00 and sleeps for 2 hours, then he goes down for an afternoon nap around 3:00 and sleeps for about an hour and a half and he's good until bedtime at 8:30. Lately though he has not seemed tired at his morning nap time. He rubs his eyes, but isn't whiny or anything, but he always goes down without any fight and sleeps for 2 hours. The afternoon nap has always been a little bit more of a struggle. He tends to cry or sometimes just talk himself to sleep. He's been known to be awake for a half hour sometimes before he finally goes to sleep for his afternoon nap. Well, these last 2 days have been difficult. Yesterday he was so tired and almost fell asleep in the car right before his nap. He was yawning and rubbing his eyes like crazy, but when I layed him down he cried for about 20 minutes before he went to sleep and then only slept for 25 minutes! So I thought I would leave him in there for a bit to see if he went back to sleep, but that just wasn't happening. I got him up and he did fine until bedtime. Today, was a similar situation. He slept great during his morning nap, then when I put him down (which he seemed obviously tired) for his afternoon nap, he cried and cried and cried and finally went to sleep. He was sawing logs...I could hear through the monitor. He slept for 25 minutes again! Then he was awake and rearing to go. I got him up and again, he was fine until bedtime. Does this mean that I should push back his morning nap and just have him take one nap? I am hesitant to do that because he takes such a great morning nap and always goes right to sleep so I hate to push it back another several hours. I don't know, this parenting stuff isn't as easy as it looks! :) Ha. We'll see how it goes these next couple of days.