If fuel it's either fuel starvation or, as you say, a fuel leak/air being drawn in. Either way I'd be inclined to thoroughly clean the engine/engine bay before trying to fault find so starting with a clean inspection area. It'll only take an hour or so to give a thorough scrub up/remove all oil...