Deffo looks better! I was hoping to keep a routine with the interior myself but due to little ones at home I just about manage to wash the car! Once you give it a deep clean I guess you can just wipe down with diluted APC with a MF.
Re headlights, yes they are bit pricey and quite rare.