The "how much can the clutch handle?" question is always a tricky one. I’d give Map 6 a try and see how it goes. If the clutch starts slipping, then it might be time to consider an upgrade. At least I'll know where the limit is
Sounds like your GTI’s headlight is giving you the ‘please check me’ drama! If you’ve already swapped the assembly, it’s likely one of those modules acting up. I’d start with the Power Module, it tends to be the culprit in these cases. But hey, if you end up replacing both, at least your car...