Hi Bob,
Have you tried doing a small crop of the problem areas only? Or is that what you have been doing? If the small areas render complete, then you could layer them in with photoshop. Or this might sound silly but, try moving the camera just a hair and setting it. I have had this problem in the past and it worked. BTW, that scene is really nice, in my opinion your best thus far.