I didnt get it done in the end, sold it on as broken when I changed back to Nikon. My issue wasnt as bad obviously as you still had 17-50mm range, but yours it a bit more drastic.
I think the quote was from Lehmanns, but try Canon in Elstree as they seem to be cheaper than the others.