What about an cheap older steel bike (trek, schwinn, etc)? you could get one and fix it how you want...

gears and a piece of mind locking it up would probably be nice on a townie commuter too, since you didnt spend a small fortune on it trying to get it to "look" a certain way.

you've already got a reasonably solid bike, why change it so drastically?