If I could restart the FLOSS philosophy from first principles, and re-derive everything, I would start by separating the existing concept of "user", which currently means both "one afforded the means of software development" and "one without the means of software development", and rethink the rights that fall out.
For instance, the existing pillar of "freedom to modify" is no longer equitable.
I have no answers now, but identifying the problem is a good step, I think.