I figured out how to get my lighting to bake correctly (mostly - getting some artifacts in a few locations). Added some pillars, moved the lights around. Feels better. Not quite 100% of the way there yet, but better.