WD-40 is great for cleaning but terrible for lubrication. When I put mine back together I used some low-temperature grease called "slick honey" (designed for mountain bike forks) on the gears and it runs much more smoothly now.

Granted the switch seems to be malfunctioning now but at least the gears are smooth lol