My vote is for disc, but whatever, it's not a big deal.
Only the Trek 720 had bad spokes. So take a big look at the 520.