Beardo, you've got a similar tale to mine. I originally had a 2012 C5, and while it was a beautiful bike that served me well, there was just something missing.
Eventually, I found a 2003 Bullet at the dealership where I bought my C5. She had only 2,900 miles, and was velvet green. Four speed, points, carb, drum brakes, I found what I was missing and in 2017, made either the best (or close second best) impulse purchase of my impulse buying career. This board has been exceptionally helpful, and downright friendly throughout my miscellaneous fixes. Just pulled her out of storage today, actually. Gotta be gentle for a while while I'm breaking in the new piston, but I'm looking forward to a long year of wrenching and riding.
I'm curious as to what battery you're using - I've heard stories of people switching to alarm and UPS batteries, and I see that the UB1213 seems to be a favorite among those who have gone this route. Is that the one you've got?