I would invest in another bike strictly for city commuting. It sounds like you have a good idea what you will need. Good luck!