I agree with your answer and want to make sure I wasn't missing something on the change in entity being allowed.    I can't see why SBA allow the 2019 C income as the reference for forgivable income - completely a different company.       

And I agree on the payroll / draw opinion.