billridesbikes

I would get a new wheel set first. Also 36/36 is probably overkill unless you’re touring or are a very heavy person. Lighter wheel set with few spokes for better aerodynamics will make a noticeable difference.