You should upgrade, I work at a marina where we sell nothing but Fountain powerboats and waverunners/jetski's. The Yamaha's are bullet proof right now. We rent them and we never have problems with them. Their 4 stroke engine is top of the line. We use them everyday for 2 months and we get all kinds of idiots driving them. As far as gas consumption they have a 16 gal tank that will last you all day, depending how you ride.