All connecting lines are 2-1 wire except I do have 3-1 from the "Bathroom Circuit box" to the "Light/Fan" box and from the "Light/Fan box to the "Light switch".

The switches I have are single pole, but I can get 3way switches if that would help somehow.

I can also switch out the wire connecting the Light switch for bathroom and light switch for hallway.

If needed I can fairly easily add another wire from the initial double gang box to the hall switch or bath light switch or I could add a new junction box prior to that double gang and pull new supply to both the bath light and double gang. I'm thinking this might be they easiest route to make it all work.

Bathroom Circuit (Double gang box with GFCI outlet and switch (for fan))