Roaming in Switzerland

Hello,

My wife send a message via facebook, and I was redirected here.
So I'm traveling back and forth between Germany and Switzerland regularly, and I chose the O2 Free M since I was told it had the option to book the EU Roaming Flat package which includes Switzerland and costs 4.99 euro per month.
I added this package via the Live-chat at the start of my contract, since for some reason it did not show up in Mein-O2 (which they told me would be the way to add it). After being confirmed twice via the live-chat that I indeed had roaming in Switzerland included (1gb flat in Europe, and 10gb in Germany) and got my roaming fees for Switzerland now refunded twice, I was told yesterday, I actually do not have the EU Roaming flat package, since this is not an existing package anymore (and apparently wasn't to begin with). Apparently, they added a package where my speed is not limited for the first 1gb in Weltzone 2, but I still have to pay for usage.
So now the only option they could offer me would be to book daily travel packs costing 2 euros per calendar day for 50mb, which is significantly more expensive per month than the 4.99 euros.

Since I chose O2 mainly for the option to have Switzerland included for a reasonable price, this contract now turns out to be very expensive, and I'm only two months into the contract! Is there a way to resolve this? I don't want to pay an additional 30 euros a month for roaming in Switzerland.

Many thanks!
Niels