Nit: what you're describing is Free Software as put forward by the FSF, not Open Source as put forward by the OSI.
I realize I'm the one who used the combo acronym first, but this is a discussion about the OSI, which exists to champion the cynical company-centric version of the movement, and for that version my description is accurate.
It is sad that this definition will represent the first practical split between these two movements in terms of their terminology, if it goes through. The difference between open-source and free software will go from a difference of emphasis to a difference in substance.
I suppose I will have to stop writing 'F/OSS'. I'll probably use the term 'open-source' less and less, and maybe stop altogether.