I think in general people traveling on award flights are also considered revenue passengers. Also upgrading with points should not drop you to non-revenue or somehow make the upgrade non-rev. Non-rev passengers are airline employees and similar who do not pay for the ticket or get huge discounts, basically pay taxes only.