IRT your fuel odor; the cure for my similar problem was to replace the copper gaskets at the fuel pump - filter fitting. The leak at that point was only present while the engine was running and the fuel pump producing pressure. It is common for amateur mechanics to try to reuse those gaskets (copper washers) after changing the fuel filter thus resulting in a leak. They must be replaced.

Stick your head under the rear of the car while it isrunning and inspect the fuel fittings around the pump(s) and filter. Don't let anyone back over your head.