I would definitely keep with the stage 3 teats if that's what's giving you the most milk input, but if that amount of NW isn't 'normal' then it does suggest possibly some discomfort was involved...did he seem gassy at all?
30min naps are often OT, so I would say that perhaps scale that first A time back slightly, even 10mins might do the trick. The best recommendation is that after a short nap, reduce the next A time slightly (15mins) to hopefully combat OT that might be accumulating.