Wahoooo!!
Got my bike back today. Apparently the Trek 2.1's have sold pretty well so far, so they gave me the Trek 2.3 frame and forks as a replacement. Same materials and geometry just a different colour frame. Better in my opinion, but I couldn't have afforded to pay for the higher model. Wheel repaired, gears repaired. Looking great.
Total price = zero pounds and zero pence. Complete warranty repair.
Here's bigging up Trek as a manufacturer and All Terrain Cycles bike shop.
Only down side of today is that it's just dropped an inch of snow outside, so I can't get out and ride it.