I like the hydro disc, and with 50mm tires and dropper post it's probably a very comfortable ride, even with alloy forks, but I am not a fan of the 1x11.

I'd go with the 2nd one. The 2x11 is probably more attractive for resale purpose, but also more like a road bike, especially with the 33mm tires if you're going to take it out for longer rides on the weekend.