I’d suggest:
- install the free driver
- remove the non-free driver
- update
- install LTS kernel
- reboot to LTS kernel
- remove 5.16 kernel
- install non-free driver
- remove free driver
- reboot
In case things go south, you may want to prepare a plan B beforehand:
- prepare a liveUSB
- note how to boot without graphical manager
[HowTo] Reach a minimal system