Definitely all signs are pointing to more awake time - the good PM nap, waking at night not crying, etc. As you are discovering, there are not enough hours in the day to accommodate such long A times and long naps, therefore a nap cut is likely in order to preserve the day to a length of 12-13 hrs.
What did you end up doing with that last A time? I may be too late, but I would have suggested giving him enough A time - at least 3 hrs or so - otherwise you may get some more NWs.
Here is a link to some nap cut ideas:
http://babywhispererforums.com/index.php?topic=164033.0 I would start with a nap of 1.5 hrs and another of 1 hr to begin.
Does all that make sense?