Tarri - you sound like me!
Ethan's morning naps have gone to a usual length of probably 2 hours, which makes his afternoon nap short. I don't want to put him down for his pm nap too late, so that he won't be sleepy at bedtime, so I've decided to put him down always at 3 pm (he usually goes down for his am nap around 10 am). That may only be 2.5 or 3 hours after his morning nap, but otherwise, he's just not sleepy at bedtime. That means I only get a 30 or 45 minute pm nap out of him, but that's okay. It just gets him thru to bedtime.
On the days we've had where Ethan's slept 3+ hours on his morning nap, he doesn't get an afternoon nap, persay. He does get a quick 20 minute catnap though, usually me rocking him for quiet time. I did the same thing when we went from 3 to 2 naps. Eventually (obviously), he got over needing that.
Good luck, and know that I'm right there with you!