Manon,
I am in the same situation.
I have a 20% CAA room only discount plus planning on buying tix from ticketmania.
When I called Disney to get pricing for the new discount MYW package the price was more then I am paying now (for room only and tix). Mind you the tickets disney offered incl. hopping and water parks etc., but I'm not really interested in those features.
So I'm sticking with what I have.