I would suggest changing the rear cog to 17 like you said, and get a better lockring and a lockring tool (or tighten at your LBS). The stock lockring will strip.

Then get decent leather doublestraps or get a front brake. It's tough to brake with the stock nylon single straps.