Non Resident Alien or Resident Alien ?

I am in the US Since Aug 2017.

On F1 Visa: Aug 2017 - September 2019
On H1B Visa: 1st October 2019 to 2022. 
I am present in the US for the whole of 2020 and 2021.

 

  • For 2019 tax return, should I be filing 1040NR or 1040?

In 2019 December, I got married. My spouse came to the US on 30th Dec 2019 on H4 Visa.

 

As of now, I have filed 1040-NR-EZ(Married Non-resident alien), should I amend my tax return to 1040? So that  I can claim my spouse as my dependent and get 24400 as a standard deduction. 

Should I be making a First-year choice and Nonresident Spouse Treated as a Resident?
In that case, should I pay FICA for the whole 2019 tax year?