Berni,

In my opinion, you've got it.  Certainly some cooling air flow to the gascolator will help some more.  Carefully-designed shrouds over both the fuel pump and gascolator will reduce the amount of air required for cooling and that might be the "final answer."  I wouldn't go to extreme measures to totally eliminate the surging after a hot start, as there is probably no way to do that.  But the surging should go away during taxi and should be gone during the run-up.  The design of the system is such that total elimination of vapor generation is just not feasible.  Note that there is a "return system" commercially available that allows fuel to be recirculated before starting, and some operators report good results.  But personally, I don't think it is necessary and it introduces more potential failure modes.

Gary