The only remaining issue is that the dark top of the cube has a tiny bit of light at the fornt and back edges. I'm not sure why this is. I think it might have to do with the light under the wall leak issue with this different way of lighting. In that case I don't know how to solve it.
Is this due to bilinear filtering? Perhaps duplicating the border pixels for each image in the lightmap will solve it?