Yesterday I needed the AA, He too had a T6 with H4 headlights and couldn't believe how bad they are and felt they were unsafe for unlit roads. He told me he had fitted Ring R484 lamps and it was safe as the fuses are large enough!
Might try them as a temp fix.
Might try them as a temp fix.