I'd go with modern Molex too. You can make your higher power lines (lamps, etc) doubled up by using 2 pins.
I hate butt splices and I'm the anal person that pulls the plastic off the spade connectors and solders them instead of crimping. Then I heat shrink over them leaving the tip unshrunk for easy connecting.
Pulling a spade apart and having the wire come out makes me made. Plus, most people never crimp them properly.