Thanks to this forum I knew my rights, was informed and had an idea of what to expect!

My 3 year factory warranty runs out next month, so I had some corrective work undertaken by the dealer.

Now -
1 My headlights are no longer foggy - new replacement
2 My battery discharging completely within 4 days was tracked to wires rubbed through in the harness - fixed
3 My centre console not locking was fixed (linage was disconnected)
4 My 'cricket on crack' siren was replaced, and I now have the new 'chirp' when locked version

Thanks one and all for the information I've gathered this last couple of months!