I would take care of your battery situation first. These bikes do not put out enough charge to stay running, much less charge the battery, until 2000 rpm. Without enough voltage, things ain't gonna run right.
Not enough voltage will mean weak spark.
The ride IS the adventure. The destination is just to get gas!