Hi
I think you need to sort out daytime naps. His refusal to nap may be that he only wants one now. So I would sort that out using PU/PD. Then at night, if he's is waking at those times on the dot, you could try wake to sleep. However, because he's doing it twice, I'm not sure that will be entirely successful.
I would do PD by leaving him for a bit, then going in, laying him down, telling him night night and then leave. If you get crying at that point, do classic PD. I think a combination of sorting out daytime sleep and breaking the night waking habit should get you there.