Inconsistent false plan details and slow upload speeds

About a week ago, I upgraded my plan from a legacy 1.2tb capped one to the highest available 2gig plan claiming 2000/250 up/down speeds. I was delivered an XB7 which I run in non-bridge mode. Today, I noticed my speeds were considerably lower than what I should be getting, so I ran a router test on the XB7 using the Xfinity IOS app, and it reported "104% of plan speed" at 1200mbps. This is bizarre because I am currently paying for and have selected a 2gig plan, and the 1250mbps the XB7 router got is much worse than plan speeds.

The Xfinity website is telling me I'm on a nonexistent "1.2 gig plan", which definitely is not the one I am paying for nor the one I have selected, though it shows the right speed (?)

This is the plan I DO have selected. 

Running a third-party test on a 10gig capable device wired directly to the 4th LAN port on the XB7 modem (the only one capable of 2.5gig speeds) shows download speeds maybe possible on "1.2gig" or 2gig plans—Xfinity overprovisions by 20%—but terrible upload speeds. And if I am getting an overprovisioned "1.2gig" plan with 1200/35 speeds (the max on sub-split configuration), why did I have the option to purchase a 2-gig plan at mid-split speeds? Plus, Home | FCC National Broadband Map shows my address is capable of 2000/300 on Xfinity cable. There's just nothing I can think of as to why speeds are bad. 

What's going on here? Do I have the plan I'm paying for or not? Why am I getting lied to about the speed I should be getting? And why are my upload speeds so terrible?