I think the FSF has done enough to deserve a defacto trademark on the term Free Software. Certainly I see no reason why your particular definition deserves to supercede the established convention.
I don't like Stallman the man, but really appreciate everything he and others at FSF have done and I think they certainly deserve a lot. But I personally don't like their definition of "free" (and when they draw the line) and it irritates me when I hear their "free" is becoming the de facto definition. Just like it irritates them when they hear Linux (and not GNU/Linux).
(I haven't done even 1/100000th of what Stallman has done, and don't think I ever will be, but still I'm sure I can criticize him. You didn't suggest I can't - I just wanted to say that I'm aware of this fact!).
