DVR Options Under New Pricing Structure

Some context:

I currently have an old "Ultimate Triple Play" bundle, which includes Ultimate TV, DVR Service, Superfast Internet, and Xfinity Voice Unlimited Select. At the time I signed up for this bundle, I upgraded my internet to "Ultrafast" AND added Premium DVR (300 hours total), both for an additional $10/month. I have one X1 DVR (ARRIS XG1v4) and one TV box (ARRIS Xi6). I recently upgraded my home network to support 2.5G and was interested in upgrading to Gigabit Extra. However, given my plan isn't offered anymore, the only way to upgrade is to sign up for a new plan.

I've chatted with multiple agents and even called in. The problem I'm having is understanding the DVR options under the "new bundles". Under my current plan, I pay for two cable boxes and a Premium DVR upgrade.

Under the new plan, Ultimate TV service says it comes with "20 Hours of DVR service". If I want to have my same 300 hours of DVR service, I have to pay for my two cable boxes, $10 for DVR service, and another $10 for Premium DVR service. At least adding the standard DVR service is only way agents have found to quote me Premium DVR service. That means rather than just spending $10/mo to upgrade to GigabitExtra, its another $25+ for the DVR add-ons.

Anyways, here's are my questions:

1. If I'm paying for a X1 DVR box, should I have to pay an additional fee for DVR service? According to https://www.xfinity.com/support/articles/x1-dvr-cloud-technology-general-faqs - "You have 150 hours of X1 Cloud DVR storage for each X1 DVR TV Box on your account."
2. Would it be cheaper to just add hours to my Cloud DVR rather than adding DVR service for local DVR?
3. Is there something I'm misunderstanding?