I'm not an electrician either but from talking to electricians and my home designer and builing code officials when I built my home the spirit of the code is safety. Therefore when you enter a room in the dark there needs to be a switch that either a): turns on an overhead ceiling light or b): a switched outlet that presumably you will plug a lamp into. IOW @tigerwoodKhorns your ideas are fine. In my home I make that switch that turns on the light a Lighted switch which to me means "You want light? Push Here"