I replaced the alternator and all seems good so far. It does occasionally still make a clunk and flash the battery and oil light for 1/4 a second. Will work out what is causing that one day 😬