Changing primary user

I bought my husband a Quest 2 back when they first came out. He’s a gamer and I thought he would love it. Unfortunately, every game he tried made gave him terrible motion sickness. I loved it, so it became mine. We had set up the headset under his Facebook account—this was back when you could only have one user—so I initially played as him until there was an update that allowed you to add more users. Prior to that update, I had purchased a number of games and expansion packs that are all under his account and many are not shareable (like the Beat saber song packs). So I’ve been going back and forth between his and my accounts to play certain games. Now there’s been an update that makes you first log into the primary user’s account before you can play on any other accounts. This has (at least on my headset) been very glitchy and it sometimes takes five or six tries to get into the secondary account. All of the solutions I’ve read online say to factory reset the headset and change the primary user but I need to keep his account on there for the things I bought prior to the multi-user update. 
So I guess my question is: Is there a way to merge the accounts? Or is there an easier way to change the primary user without having to re-download all of my apps? (I had to do that once after an update that went wrong and it took FOREVER to complete.) Any advice would be appreciated. Thank you!