CM1000 and 200Mbps Uploads

I recently changed plans as the agent on the phone told me I could get 500Mbps down and 200Mbps up. I setup my Netgear CM1000 and we tried everything on the phone. At one point I got fast.com to say I had over 1Gbps down, but no matter what, 24Mbps upload. Once and a while it will pop to 40Mbps for a second, but then drop right back to 24. My OFDMA upstream channels are not locked, downstream has one locked. 

So after reading everything I can find it seems that the CM1000, while fully capable of delivering 200Mbps upload can not on Xfinity. The cheapest upgrade option is the CODA56. Should I go get one of those, or is there any hope my Netgear will get support?

Thanks!