I suggest to simply use one organization and leave everything as is.
One improvement we can do, and I would welcome that, is to make the organization selection automatic when the user has access to only one organization.
I think that would be enough and would keep it simple for you. Overriding that part may cause you unnecessary headaches.