Headlight relay system and Convertible top relay system recommendation

Sound like you have a good handle on fixing the charging system.