Once you get that Yamaha running right, I'd consider keeping the package. Cool little boat, and looks built to stout.