You are taking the exactly correct way to think about savings: asset-liability matching, and being realistic about it (not imagining you can move to a new place because 'retired', so do, but many can not do so successfully).