That seems like a good choice. After reviewing your analysis again, I probably was a bit conservative, or had "2-edge" instead of "1-edge" paths in my mind for some reason.
That said, the old saw "do you want it to work, or do you want it to be pretty" still holds.
