Job done! Works perfectly once again, nice to not have that annoying window not set fault message every time.
Fairly straight forward job, bit of mucking around, probably took 2 or 3 hours all up including a cuppa half way though.
I replaced the rivets with nuts and bolts as suggested.
Thanks for the help everyone,
Cheers, Pete.