I usually buy the gallons from BPS when they go on sale in the spring, but didnt see them on sale this year. However I still have some gallons and have the same issue with oil spill over when the motor is tilted. I keep one of the gallon jugs in my rear storage and make sure the tank is about 3/4 full when I launch.