odd GI baking for VR

Hi.

I’m trying to come up with a preset for a GI bake, for VR.

The results you see in the small jpg: (a larger one is in the zip file) The render from the camera view looks fine, but when I use the same set up for baking, light leaks and very odd shading on flat surfaces. Note the wall with the 2 doors.

My sample count is 10000, 6000 over the sample count recommended for baking. Yet, I still get these odd results.

Also note the corners, and the light leaks on the baked version.

Thank you in advance for any help!