Does he wake during his naps for his pacifier too? If so, that's probably the real issue with the short naps, not A time.
At 5 mos, most bubs can do a tad more than 2 hrs, though the first A time of the day is often shorter. so your routine doesn't really look all that off. One thing I do notice is that even when he has a short nap, you still have him at 2 hrs of A time. If he takes a short nap, he won't be able to handle a long A time, because he won't be as well rested. So I would shorten the next A time if he doesn't nap well.
Is he swaddled? Also, since he's spirited, his environment will be really key to helping him sleep well - so darkness is key (blackout curtains, foil or something to block out daylight), and even things like a mobile on his crib, or a bumper with lots of things on it, or even stuff hanging on the wall can be a distraction - so take a look for those things. Additionally, spirited bubs often need a really short winddown, so that may help as well.
hth
michelle