Tax Year Prior to 2020: This year we moved to Austin, TX. Last year we lived in CA but did all our work in CA last year. File as normal but change current address?

Yes.  If I understand you correctly, for 2016 you lived and worked in CA but moved to TX in 2017.  If that is the case, you file as normal (full year CA resident) but change your current mailing address as you said.