Hi hun, when my DS was first PT we had a spell of EW for wee's which did pass after a couple of weeks.
Also we went from 1.5 he naps, to 45 mins but still had BT messing so pretty quickly went to 20 mins which is the only time he doesn't wake cranky....could you try 20 min naps and earlier BT to see if that helps?