Knee-deep in planning for a diversion of water from Lake Michigan, the City of Waukesha has switched horses in midstream.