Device Payment on Deactivated Phone number

I've tried phone, chat, and store. Please Help 🙏.

My wife and I upgraded our Galaxy S22's on the 'By the Gig's plan about 4 months ago to 2 Google Pixel phones on the Premium Unlimited plan. I was having trouble activating our phones through the app so decided to call customer service. They sent me to who I can only assume was the activation team and they started the activation process with our new phones. I was then told that since we are moving to ESim that they would need to open 2 new phone numbers on my account to activate the new phones on an ESim, then transfer our numbers. I agreed, as I am not an expert, and they went through the process. Our phones were activated and that was that.

Unfortunately, there was an issue with our trade in credits for reasons I did not understand at the time. I spent quite a bit of time with customer service but got credits for them. ( No longer an issue but very related).

Recently, my wife and I decided that we wanted to go back to the Galaxy phones and get a watch for our daughter. When I went on the website and tried to upgrade, I noticed that the device payments were tied to the deactivated phone numbers. I immediately called customer service so they can be put on the right numbers and we can upgrade.

I have been on the phone with them for hours, talked to chat for hours, and even went into an Xfinity store to get this fixed. I am not joking when I say I have spent 25+ hours on this. Not one person has been able to help me and I keep getting different answers from different reps. It's honestly infuriating.

A. I would like to know if something like this can actually be fixed? I would much prefer to upgrade at the Xfinity store. If possible.

B. If it can be corrected, who do I need to speak to or what should I tell the store rep so this can be resolved correctly?

Thank you in advance. 

Matt