Well, it's just been getting worse

I've limited all naps except 1 to about an hour, but he's still waking up about 5am. He's only been going back to sleep in my bed, which I've been doing just to try and get back on track and achieve this miraculous 7-7 I've been aiming for!
I realise bringing in with me isn't helping but he will literally not sleep any longer in his cot. He gets hysterical when I try to get him up.
We had ONE good night, with one wake up, and a feed about 5 then in with me and slept til 7.30. I know I shouldn't bring him in, I know that's the first thing I should stop but I can PUPD for an hour, take him out the cot and change of scenery and back again and it can take 2 hours to get him back to sleep and completely defeats the purpose. He just wants to get up and play, and gets hysterical when I try to stop him.
I've been trying magnesium spray too as a FB group I'm on have been raving about its benefits and how lots of babies are now sleeping through, but it's not made any difference. I didn't have high hopes but thought it couldn't do any harm.
Now I just feel defeated as nothing I'm doing makes a difference and I'm just tired and grumpy most mornings. He's just started his typical 'leap' behaviour and I think this is just making it worse. The NW I can handle tbh, that makes sense with his age and I am happy doing that until I go back to work at least then I might think differently!
However the EMW isn't manageable and he's not getting a full sleep, even including NW. Last night was about 2000 (fought it from 1930) to 0500.