Looking at the second picture again it feels a little odd that the brick shadows are being cast to the bottom right of the screen, however the stud texture "shadows" go towards the bottom left.
Any plan/way for the stud "shadows" to also be affected by the new lighting, so that every shadow go in the same direction?