Hmmmm........that's actually a tough question. I think it would depend on where you put the precedence. I don't think brakes are a big deal. (just, imho) I know the mfgrs are force-feeding us disc brakes, but I think they just want it for money & change which equals expanded product offerings, which equals more stuff to buy and ultimately, well, more money.
My new Evo has significantly better brakes than my Quick but both work well and will stop either bike.
That said, I'm also not huge on groupsets either. My Quick has Alivio stuff and my Evo has Ultegra. Not the night & day difference I was expecting. Sure, Ultegra is nice, but I have no problem with Alivio and in either case (especially in the nicer shifting Ultegra) I can't see where I'd have any desire for electronic shifting. I know it's supposed to be nice (and cool) but I just don't see needing it. (If I rode a Di2, I might think otherwise)
That might not help, but I think either frame will be great so really more about Di2 vs disc brakes, imho.
(shrug)