Agree with Swerve. A nice set of carbs is a nice way to go. Even though the 1600i cam profile is better than the 3i cam it would still benefit from a fast road cam and vernier. Just ensure you speak to somebody that knows and understands the 16i and its querks