since your only doing this in order to maintain your squareness why not change the smooth option. The preserve option set in the smooth options should be what you want. Either geometry borders or selection borders. If you work back and forth between smooth and not, save your selection. Do that by create>set>quick select set. The new set will be in the outliner.