I thought I posted this once, but it's nowhere to be seen, so forgive me if this is a duplicate.

After reading this entire thread, I've concluded that Toyota is real sorry, but there's no known fix, no recall. I.E., live with it.

I've been living with it for the 8+ years I've owned the car, and seen the problem maybe 3 or 4 times. If I see the fill problem, my current plan is to immediately switch pumps, and the problem will hopefully go away, and I'll avoid the gusher at the end of the fill.