You are correct about the TFSA. Make sure to uncheck the "Use retirement date" in your AUTOMATING SAVINGS entry and just delete the end date for it to end at death. When "Use retirement date" is checked, it will use the retirement date.

This "Use retirement date" option is available on many entries for beginning/end dates of INCOMES/EXPENSES/AUTOMATIC so that if you change your retirement date, all those entries that use it will be automatically updated for you.