ok, so If I understand what you are saying is this;

if we backup to your blockchain from yesterday, use the "latest" source you are working on right now to rebuild our wallets, orphan what blocks were mined between now and then we will have both PoW and PoS working correctly. YES??