I am beginning to think I might end up leaving the oem one in and run it to a swirl pot then a Walbro 255 or some such from there. I really would like just to replace the in tank one but I may still have the cornering issue with it. I believe the oem one has an extra pipe/hole on it which self feeds it's plastic pot to keep it full whereas other replacement ones don't and rely one fuel being looped back to keep it toped up (if that make sense) Only problem is to find some space to mount it. 1lt capacity will do.