I am having the similar issues so what i am planning to do is add PPP loan forgiven on schedule K. Part II, Other subtraction and then subtract PPP loan again here and then adjust in Part IV as you mention. and make some changes manually now.
