For the other part of your question, it's a well known thing with the 944 to make/buy a separate headlight relay harness. This has a couple of positive things going for it. First, you avoid fires from the current that can go through older, oxidized contacts in the switch. Second, getting power to the lights straight from the battery or alternator results in significantly higher light output. Lumen output is not linear with input voltage, so small decreases due to oxidation/corrosion in the wiring, at the switch, or basically anywhere in the circuit, will make the system terrible, quickly.
I've asked, in the past, why folks don't do it on the 928, but I didn't quite understand the reasoning at the time and dropped the idea. I'm still not totally sure where I'd put the relays in the engine bay, even if it were viable.
Good luck.
