Sounds like a plan Jim... Might I just point out while the poor old L85 takes yet another beating, the proof of the pudding is in the eating.
I know a few people who have extensive front line combat experience with the A2 and thy aren't complaining, quite the opposite in fact.
It's far from perfect with regard to egronomics (to a civvy like me), but that's only an issue if you aren't familiar with the piece.
Yes, it has had a long and very troubled history, an abject lesson on how not to procure a service firearm but...
The fact of the matter is, it's here, reliable and very capable in trained hands.
As long as HK are building new barrels, receivers etc and it's still being updated, I see no point in replacing the L85A2 and it's potential A3 offshoot until a new calibre is selected by NATO.