Toddler Bed Drama for this Mama

Alright, basically this whole toddler bed thing is NOT working out for me. I just want to put the crib back together so he's trapped again. haha But I know since I've already got this far, I need to keep going and be consistent. It's taking a while, but I can see an improvement. The other night we put him to bed at 8 and he went down great and slept all night! Last night he fell asleep in the car, and when we got home and changed him into his jammies, he was wide awake and played for an hour and a half. We have to leave his lamp on in order for him to stay in his room. Which bothers me. I want him to learn how to sleep without that, but baby steps right? So he will stay in his room but is noisy and keeps opening and closing his door and wakes up the baby. Last night he came in our room at 4:30....and slept there all night. If that becomes a habit, I'm going to scream. haha I want him in a toddler bed, I just want him to stay there and sleep well all night! Wishful thinking, right mom's? I guess overall the fact that he stays in his room, and eventually falls asleep and usually stays in his bed all night will have to do;) Any tips for this transition? Earlier bedtime? no naps? Sleeping on his floor with him? Or do I just let him kick and scream until he gets it?