Another option for your lights and switches is to pick up a Lionel Type Z. It's 250W but leaves quite a bit of room for expansion. Mine powers all the lights on my layout (probably about 80 or so 12v incandescent bulbs) as well as a 494 rotary beacon, sawmill, coal loader, barrel loader, and ice depot. Doesn't even get warm after running for an hour or two. Type Zs can be had cheap. I paid $90 for this one at my local hobby shop.
