What don't you like about your Trek 930? That will help folks give you some recommendations. Your bike sounds like a great bike for what you want to use it for. Get it tuned up and maybe a small upgrade on a few parts if they need replacing and sounds like you're good to go. It's the engine that makes the most difference. Once you are riding again for a while, you will know better what you are looking for.