I hope the problem igets fixed, but I'd be considering getting an autoelectrician to start mapping out that wiring and improving where necessary. I know not cheap, but unless Morgan is prepared to help with drawings etc.,or its just leaving to luck until the next inevitable issue arises. Beautiful cars shame about the electrics