Another thing you should do before the warranty is up is have the oil analyzed.
http://www.blackstone-labs.com/ can tell you if there is hidden damage that needs to be addressed now, so it doesn't blow up a week after the warranty is over. Given the age of the scooter, you will want the cooling system pressure tested, to make sure the hoses and connections are sound, the battery load tested, the stator output measured, the flow of the petcock, and the vacuum generated at idle and high speed measured as well. Also, someone should check the diaphragm of the carburetor for perforations or damage from ethanol, and the slide of the carb for excess wear. Carburetors are super expensive on these bikes. The steering bearings should be inspected for excess play, because that is a commonly neglected area of maintenance, and you don't want them wearing to the point you have a flat spot when you turn the bike. A good shop can tell you if that's already started. The brake pads should be inspected, and the amount of wear measured, and you need to make sure the rotors don't need to be trued. A good way to tell this is if the brakes slightly grab when you lightly apply them, and have a sort of pulsing feel. That means your rotors will need to be replaced, and that's expensive.
Hope this helps.