Between the two, Surface 604 since it has torque sensing. Also much better component specs.
What do you mean by mild trails? At the current $2485 sale price (after rebate) in the US I'd seriously consider a Turbo Vado 4.0 if most of your riding will be around town, with mild off road sprinkled in.