Switching to a tax-free account

I am 69 and retired. I am married in community of property. My wife, who still works, has her own pension fund. I underwent a heart bypass operation in 1996. I have had other operations since then. I have R2 million in discretionary investments and R1 million in a living annuity. My income drawdown is four percent a year. Should I transfer my discretionary savings to a tax-free savings account (TFSA)? Name withheld