I don't currently see any reason to wipe again during the 2.0 move, so that's likely the plan. Wipe now, implement a bunch of cool fixes/stuff for a while, and then later move to the 2.0 client (with no wipe at that time). I was initially against the idea of a wipe, so if I do one, this will likely be the only one I ever do.
