Ds was a terrible sleeper and eventually after help from sleep dr got it cracked and life changed!!.... Until about 6 week ago when we moved him into a big boys bed
He will not stay in bed and can run faster than me cross his room and into our bed 

I've tried everything
There is a stairgate on his door for stair safety but it acted as a barrier to stop him leaving room
I did rapid return but after 2 hours he was nearly physically sick with rage rather than upset (I know because when I foolishly lamented in a shattered heap he instantly stopped the rage) and then have been away with work so not been about to start again
Dh is supportive but struggles with it
I am happy being bad cop and doing it, I did it all first time around as dh was away anyway
Problem is I'm now a bit confused about wtf to do to sort it out and have zero bedtime confidence after such a bad time from the start
We have a clear routine which hasn't changed
Please can you help with suggestions especially if you have reformed a teen toddler
Thanks
Ps should say he will happily sleep through elsewhere ie our bed spare bed etc just not his 