Well as you know I'm more familiar with the short am, long pm nap approach, I just know that those who did it the other way around, would just keep pushing the morning nap later in the day, so that LO didn't get OT by BT with a short pm nap...you may find that you can push the morning nap even more, since he seems able to handle those A times pretty well?