I can't be certain he needs more A times. How is he waking from the 30min naps? If he wakes up happy and chatty then I would increase the first A time even more, by 10-15min, but if he wakes up cranky and crying then I owuld think he might be OT and then hold the 3h A time for a bit longer. If in a week there is not change with that nap then I would increase A time anyway by 10min.