This is what I do for You:
1. I redraw Your file to be how I think You want to be.
2. I use 2 invisible objects to make hols in walls.

And here is the modified file.
Hope is useful.