So all back together now, and this appears to have sorted it - no petrol smell and a much more emphatic 'whoosh' when I take the fuel cap off. I polished the pin, and cleaned the socket out with switch cleaner, I'll look into getting a replacement plug.
