As you said, usually it's not worth the effort to hassle with them. But I think it's important to stand your ground and demand everything for yourself or otherwise they get too comfortable slapping charges here and there and manipulating the price how they feel like.
It sucks and I hate those kinds of providers.
I wasn't impressed that the additional charges were slipped under the radar so wasn't in a good mood to start with. It got sorted, sort of, but how many people let it go and allow companies to get away with pulling in revenue for no services/products provided. Assholes.