[Resolved - Partially] Gigabit x2 - Only getting 1400Mbps download / 40Mbps upload

Recently upgraded (2 months ago) from Gigabit to Gigabit x2 and my download and upload speeds have not changed!

I'm using an Asus GT-AX6000 router, Motorola MB8611 modem and my entire LAN is hardwired 2.5Gbs.

Running speed tests directly on the GT-AX6000 and my PCs, I am getting 1400-1450Mbps download and 40-45Mbps upload.

This is NOT close to the 2000Mbps/200Mbps I'm paying for, I appreciate that it clearly states "speeds upto....." but I expect it to get somewhat close!!!

Anyone else running into the same situation ?

[Update]
After spending a fun hour texting with customer service/tech support, we finally managed to figure out part of the issue.  It would appear that even though my account said I was upgraded to Gigabite x2 and I was most certainly paying for Gigabite x2, I was in fact on Gigabite extra.

I still do not have the 200Mbps upload, that still seems to be capped at 45Mbps.