Well I pulled the dipstick today and it did have a fuel smell, but when I swiped it with my fingers they did not have an over bearing fuel smell. Although after working in the engine bay my fingers usually smell like oil/fuel/dirt. So that's that...
It might be worth removing the fuel pump and using some compressed air to find out if the diagram is leaking. Maybe you could use a small length of rubber hose and some hose clamps to secure the air line to the pump then put a little blast of air into the pump to see if it leaks. A leaking fuel pump dump fuel into the oil causing issues.