I'm a bit late to the thread. I hope you've solved it with that. I have the same 31L model, just a bit older. We have really liked the floor plan.
I had lots of intermittent genny problems. I feel confident it's heat related vapor lock. I've done a variety of things and I feel very confident that it has been solved, since my trip this summer through the desert to the Grand Canyon....
I do think that moving that filter and pump out of the plenum is a good move. I had been thinking about trying that but didn't get to it.
What I did....I started with trying to ventilate the door. my first attempt didn't work well. i think the vent was too small and it was still drawing most air from behind the door and from under the coach
So I ended doubling the vent opening and I rigged up a baffle to direct the air. This is both the cooling air for the engine and combustion breathing air....so it helps x2. here's a couple pictures of what I did
Next, just before my big trip, I insulated the fuel hose all the way back to the tank. In doing so, I found that Thor had it hanging loose in the sliptream, not too far from the driveshaft. I figure it picks up a lot of heat over that fairly long length. Heat from the V-10 but also heat radiating up from the hot pavement...and even heat form the generator's cooling air and exhaust. I used just regular pipe insulation from the hardware store. I used the rubbery EPDM type, not the foam type, and sprayed a couple coats of undercoating from a rattle can on it before install in an attempt to help it last a bit longer. I tied it up neat and tucked it into the frame so it's better protected. If I'd had time I would have liked to replace the hose while I was at it.... oh well, another time.
The other two solutions that I had in my back pocket in case these fixes didn't work.... add a second auxiliary low pressure fuel pump back closer to the tank to pressurize the line.... &/or to install a re circulation fuel line from the genny's carb back to the tank.
The other variables I changed, but do not think it directly affects the solution...were the oil change and fuel filter change I did at the same time as the insulation.
Just the other week while running the genny for Irma, it started to surge. Grabbing for anything, I found that if I turned the altitude adjustment screw to a higher elevation, it smoothed out. I let it run that way fo a minute or so, then adjusted it back to sea level and it ran smooth for several hours after.... unrelated I think, but I figured I'd throw that out there for your future reference....