Yup, the L55 was part of the original upgrade for the 2A4+ but it looks like....from good sources....that the plan and upgrades have been scaled back due to funding.
I would expect the 2A6Ms.....whenever they do finally come back from Afghanistan....2011+?....will have some heavy work done to them to "de-combat" them....remove the slat armour and Barracuda and whatever else is can be stored.
I would think that the Wegmann MBGDs will be standard...an easy modification.
Time will tell what the final result will be....right now the tanks crews are focused on what they have (and very happy) and not too concerned about what they will get.