Already done, made no difference.
Update as of this morning, everything is connected up but after the hazards working fine for ages last night the f*cking 15A fuse is blowing again.
Looking like I'm going to have to take the dashboard off and start rooting around for shorts in there... gotta...