I agree with the OP, and I am not just "repeating the Uber party line". I believe 3 categories of work are needed:
1. Employee (e.g. current W2), where you have a single full-time employer who is primarily responsible for your wages and benefits.
2. Independent Contractor, where the IC has full control over their rates, where they do the work, their tools, etc.
3. "Flexible" employee, where the employee has full control over their hours and availability, and to work for multiple employers, but doesn't have control over rates or how the work is done.