Thanks again for all the suggestions. At this point you all realise I'm a fussy barsteward but this thread has helped me see what options are there and think twice about which one I want to commit to.
I'm currently pestering Mason about the Bokeh because the extra cost of the frame offsets itself somewhat against the cost of building around a QR bike now and changing in future to thru-axle requiring a new dynamo and a wheelset rebuild which is hundreds before I've bought a frameset, with the Bokeh I doubt I'll be making a change at all.
The Kona Roadhouse seems to meet your criteria - thru-axles, Shimano hydraulic discs, clearance for 30mm+ tyres with guards and an 853 frame. Relatively inexpensive at £1444:
http://www.tredz.co.uk/.Kona-Roadhouse-2016-Road-Bike_82254.htm?gclid=CI_H69rektECFUZAGwodDTcBQw
Thanks for the suggestion it matches my OP very well but at it's just a personal preference matter - for that price I could not live with that colour :/
It's a duel between the thru-axelled and rather costly Bokeh and the more economic QR CAADX stripdown option now.
I'd be tempted to get the Mason and maybe compromise on the groupset if you really want thru-axles.
If I go for the Mason I'll use the same kit and just eat the cost; it's not so much an issue of max. budget, more that I'd rather not spend astronomical amounts on one bike but I can justify an extra 4-500 on something well designed that will ride well, do what I need and last me.
OP just use what you have got and save yourself a grand or so.
It'll be more than a grand I'll save but I'm already set on something new. There's nothing wrong with my Surly but by the time I've tanked it up some more with heavier tyres and more luggage points for commuting and touring it will really take the spring out of my step on other rides where I want to be pushing the pace.
