Same! Should have done this in the first place. The under-crown mount for fenders/light on the enve was always a bad idea.
Also giving this Fizik argo tempo a go. Spesh power arc had nice shape but very firm and felt it on all-day rides. Last ride before rebuild had 30 miles of this:
Wow those latest modifications really did it for me, love the matching colour fork