This sounds good, however, the biggest problem is sustainability of FOSS if there are commercial alternatives. FOSS needs to be simply made competitive and agencies need to get their procurement processes straight. FOSS is already better and cheaper in the long run, but commercial companies will likely win most bids. FOSS is IMHO no value in itself, but it has value if used and supported by govs and it is just procurement that has gone all wrong.
Edit: to explain the value thing: just look at all the crappy FOSS build by many H2020 funded projects(there are exceptions) You can waste money also for building FOSS. Particularly if companies building it see no value in maintaining it and nobody has incentives to jump in.