forgot to add, when hunter has an ew, i keep him in his cot until usual wake up time. this did often mean me being in there with him once he started to fuss, keep lighting low, read some books or let him play with some soft toys, anything lowkey and pretty quiet. then at 'wake up' time, lights on or open curtains and i sang a silly 'wake up' song, but just talking about it being 'time to get up' would be fine too. then aim for normal nap time (or close to) like there was no ew. if you put him down too early it will encourage the ew.
HTH