I'm curious, why don't the Company doesn't just share the folders with the Individual and revoke access to the shared folder when the Individual leaves?
You won't have to combine to the Personal / Team together.
And make it so that the shared folders doesn't count towards the Individual's account space limit.
Bam. Problem solved (?)