At first blush, it sounded like the dimmer (floor) switch, but I think you've shown that isn't the problem.
The only suggestions I would have (and I'm NOT saying you're doing something wrong) is to make sure your under dash switch is rated for the draw of the headlights. Some aftermarket...