A.S.
As far as your son is concerned, I say let him sleep on the floor for a few weeks. Our daughter has been in the toddler bed for almost a year now and occasionally she still gets out and sleeps on the floor. It doesn't hurt them to sleep down there and when they realize how hard it is, they start climbing back into the comfy bed.
What we have started doing for our girl as far as the scary room thing goes...put the main light on a dimmer. My girl even asks for the "lights on" when we're doing our betime routine. I reassure her that the lights will stay on, but dim them to a level so she can sleep. It's really helped