I also have an '05 and had the same spoke problems. I think I popped almost 9 spokes on a 1,700 mile tour. I replaced the rear wheel, but now I'm debating rebuilding it with different spokes.