The latest from my LBS is that Shimano has no parts, and Trek wants to replace my whole wheel but there is no stock til December, so their solution is to just have my bring it in and re-grease my wheel every time it starts to make the noise again until they have stock on the wheel.
I decided...