Not a bad foundation. I think your edges could use some pop in the diffuse. I recommend baking out a cavity map and overlaying over your diffuse. You could always download Gnald and give it a go pretty quickly.
Yeah, you're probably right. I saved the edge highlights mostly for the specmap but I should probably have some of them in the diffuse as well. I just used a cavity map from nDo, but I will render one in xNormal as well (along with a curvature map). Also what is Gnald? I tried a quick google for it and the most relevant I…