I think, under the circumstances, that if you have a functional Outlook, you might want to delay trying to fix the extra PST problem until you have completed all the other changes.