TCJA is exactly what I am worried about and hoping there is some sort of work around.

The client is already utterly heart broken that she allowed herself to be ripped off like that.  Worse yet, the amount stolen represents the bulk of her retirement savings.