Well, the new bulb arrived yesterday... fast shipping!
Haven't messed with the H7 bulbs on a bike before, so when I removed the high beam I was suprised to see that the hard plastic "bakelight" base is an adapter... the old bulb pops off and you plug in the new one and put the whole thing back in the socket and snap the wire clip back on.
Except the blades on the new bulb were a hair too long, so I touched them up on the grinder (careful not to touch the bulb) and it worked fine.
Can't ride yet but I fired 'er up and flipped the high beam on and it really lit the shop up! I left it running for about ten minutes to see if the wires or base would heat up... nothing. Looks like it's gonna work.
BTW... the cargo nets are 6-point, not 4-point... pretty nice for only $1.99 each.