The other thing that comes to mind is to check all your vacuum hoses mainly for the heater control. As I think they take the vacuum from the inlet manifold. You could be getting some fuel smell through that. Just a thought.