OK so one problem solved.
The light bleed was pretty bad, so without going crazy the best solution seemed to be build a small extension.
This was it before:
Here's the extension all built and stained:
And here's the final result:
No more light bleed which is much better but I'm not sure if I lost a few points on style
