That's a definite improvement with the lighting, it might just be me but there seems to be too many shadows being cast, maybe you could turn off a few of the shadows?
I'm not actually a big fan of baking shaders, they don't always come out that great, unless they're really, really huge. As you know C4D has plenty of great procedural shaders, so it shouldn't be too hard to recreate the textures
