Time to upgrade (to steel!)

I'm ready to sell my 12-y/o Spec Allez roadie that I use for commuting and upgrade to a more versatile, steel-framed, do-more bike. Will be used to commute to/from work (22km), winter training (60-80km), and 'hopefully' race amateur on next year local CX circuit. Budget is $2K max. So far my options are:
Surly Straggler - http://surlybikes.com/bikes/straggler

Brodie Tiber - http://www.brodiebikes.com/2015/bikes/tiber.php

Any other options you can think of? Short list of wants but:
- stays big enough to accept proper fenders and 38mm tires
- disc brakes
- Shimano 105, SRAM Rival or higher components

Not sure if you can fit cross tires in a Tiber or not…..

But, and I can't believe I'm saying this, the Norco Search steel frames look pretty rad….. The Hayes Brakes are not that good though.

http://www.norco.com/15search/

Thanks for the Norco reco.
I'll have to check with my LBS on the Tiber. I read Morgan's article about the Wolff (similar frame dimensions as the Tiber) that noted the frame/fork can fit tires upto 40mm wide. However, the front derailleur rubs on rear tires larger than 32mm.
Unless I switch to single front ring…

Transition Rapture? gotta like the promo video…
http://www.transitionbikes.com/2016/Bikes_Rapture.cfm?Token={ts_2015-10-23_12:32:49}-933a63470dcad360-FBC1F853-9FE0-43AE-7A7226E977FFE23C

Check out the options from Planet X I have had a kaffenback as a do it all bike and it did

Sent from my iPad using Tapatalk

I have a brodie monster, originally wanted a straggler but they have pretty racy geometry

One thing you don't want is mechanical disc brakes. Hydraulic are so much more simple and require far less maintenance.

I have a Surly Disc Trucker. Great bike for commuting and touring, although I don't know how competitive you could be on it for cross.

I don't know how picky the local CX races are for tire size. Unless you weigh more than 170lbs you aren't allowed to use a 38mm tire at a UCI event. A 35 mm tire is the widest I would be allowed to use although for commuting I lean towards a 32mm cross tire. I have a 38mm tire on right now (that was all they had and I had a screw in my tire). It clears my frame but I had to make sure my rim was damn true and it's a bit of a pig.

ps. Just checked the rules. Looks like tire size is fine unless you race elite level in which case you would be subject to the UCI tire rule.