OK, I wired it back the way it was before it blew the fuse, and the headlights actually do work. Switch is just crusty, I guess - when I flick it on and off sometimes it does not turn on sometimes it does - but it's the switch. When the lights are on, they dim/brighten with engine RPM.
So, I...