Let's focus on this, first. I do not believe that Swap is related to your problem. But we can explore creating a Swap Partition and setting up Hibernate if you want it, in a new thread.
For this one, please review here:
Please follow the steps outlined in that thread. There is a reasonable chance that the recent update with kernel 5.11.0-34 and your Nvidia are in conflict. This may have caused your current situation to revert, even as you had previously marked it as resolved.