Well I tried the old lighting method with the new 4 sample method from the lumel corners, but while it did fix a lot of artifacts it still left a bunch and created new ones that I'm not sure how to fix, so it looks like the above will be as good as it gets for now.