I think the right thing is to go back and forth between the two systems. Wait until people are fed up with one, then switch to another to clean up and optimise.

I think the right thing is to go back and forth between the two systems. Wait until people are fed up with one, then switch to another to clean up and optimise. Once that stops working well switch to the other model. Rinse and repeat.