Yamaha SR 400

[Fawlty]

Here is an interesting candidate for an upgrade:

http://www.cycleworld.com/2014/03/06/2015-yamaha-sr400-first-look-review-photos-specifications-pricing/

Not many fuel injected kick start only bikes around!

[Water Warrior 2]

The Retro look is good but there are a lot of other candidates out there for the same or less $ with a push button on the handlebar.