I think you found the answer. NEVER change a preparer once they are entered in the Options. Every new preparer gets a new number.

When you go back to amend an old return, you then would change the preparer number in the return to match the person doing the amendment. When you go back to an old return and want to print a return, it should print with the original preparer on the return.