Sounds like a great time to source a bike that fits you better and at the same time you can spec it with gearing that matches your particular needs. A win/win.