After much research into the different alternatives, I decided that the best and most cost-effective solution was to buy a new bike. The n+1 rule is a good answer to most cycling problems.