Crib to toddler bed

I need some advice. My 19 month old has become a super climber and has been climbing out of his crib. He’s had a few gnarly falls so we turned his crib into a toddler bed. we purchased a railing so he doesn’t roll out. We are in a one bedroom apartment until we move into our new house next month. So his bed is in our room for the time being.

Our normal schedule is

wake up around 7:30am

Nap around 12pm-2:30-3ish

Bedtime is 7pm

When we started the transition to the toddler bed my son would get out of bed and we would have to go in and put him back into bed a couple of times.

Now he’s waking up around 3am and getting out of bed and running around the room like a wild banshee, trying to play. WHAT SHOULD WE DO?

We’ve talked about cutting his nap but he starts preschool in September and they have “nap time”. Should I cut the nap anyways??

We’ve also talked about pushing his bedtime to 7:30-8. BUT I work at 4:30am so getting him to bed at 7 kind of gives me a little break before I have to go to bed 😅 (I know that’s selfish)

I’m open to all suggestions. He’s always been such a great sleeper. Ugh the damn toddler bed is throwing us off. 😂😂 My husband and I are tired 😂😴