It's good news that he settled a little quicker for you tonight
I wonder whether he's ready for his nursery naps to be capped to a more similar length each day (maybe ask them to ensure he doesn't sleep more than an hour) and then you try for the same a weekend. Like Katherine suggests, maybe he'd manage with some quiet time lying down in his bed at the same time each day even without actually falling asleep.
As a starting point you could talk to him in the morning about how you are going to let him have a rest time each day and if he's willing to stay in his bed for the allotted nap hour (even if he doesn't sleep) then you'd be able to work on moving out of the room over a period of time using the gradual withdrawal technique, if you feel this would suit you better than walk in walk out. This technique may also help to reassure him tif he's feeling anxious about being away from you. I know my DD has really gone through patches of needing me present more often.
You would use the same techniques for settling him at BT if he needs your help then and also for all night wakings. I appreciate this would be much harder for you if they go on for hours at a time, could you make yourself comfortable in his room, sleeping next to him on a mattress on the floor or similar?
I wonder if you try this and then get him up and have a physically active morning for him, see if he'll take a nap and then aim for BT no later than 7 if he's not had a nap or perhaps 7.30/8 if he does take a nap and see how you get on. These proposed timings are guesswork really so it may take a little tweaking, perhaps you could post what hapens each day for us to look at and review.
You are very welcome for the suggestions. We have all come here for help at one time or another for support and have stuck around to help others. If you feel like you have any insight on any of the other posts please do feel free to add your thoughts, none of us are experts here, just parents like you