A dyno tune, even not the greatest one-is the way to go. I've dynoed multiple toys, and you always end up with a better, smoother, cooler, faster running beast. You can also ask your mech to lean it slightly for the part throttle applications and not lose as much mileage as one would think...