it's flickering with GI because GI flickers. There's not much that can be done about it at the moment, however flickering can be reduced with the right settings, but they cost render time. I find the fill light setup is a good solution to the problem. I haven't even optimized the default fill light setup. If I had, it would have looked even better, close to the GI version.