I would add/modify 2 points
1) remove the country limit. As most of the Employment based Visas are used by H1B's. H1B does not have a country limit so there should not be any country limit on the green cards
2) For the 3 year extension thing, please make it 3 years in all circumstances. Just replace 1 year with 3 years. Abolish 1 year all together, if that does not succeed you can ask for just 1 time as a releif for the people in backlog centers. Eventually the current Labor will also become slow and I-140 is already showing delays.
Please talk to Rick and see, if this can't be achieved ask for atleast 1 time releif.