Yeah, I agree. Not much point worrying about swapping the last few v1 stragglers, especially when v2 doesn't work. Fix v2 first, then worry about the little things like coin swapping.