Welcome Brian
I also run an S2 and would be interested in the detail of your sun visors and seat head pads, my car is due to go to SS quite soon for the visors, also the new filler cap you mentioned does that resolve the tank filling to full as my car never reads above 7/8.
