To the OP, it's all about trade-offs. Disc brakes are terrific especially in the wet, and they make you agnostic to a slightly wobbly rim. But, you'll need to become proficient in adjusting them, truing rotors when they occasionally get knocked, and dealing with how some of them squeel. I don't use them on my road bikes, but wouldn't hesitate if I had the opportunity. I'd pay the upcharge for them.
Since Trek has done the safety recall, pay attention to your front skewer locking. Watch for rotor interference. Why not flip the lever to the drive side in the front and be done with the problem?