the fix looks good tweety. I still think learning render layers was a "it all falls into place" moment for me. I think its the only way to render now, however i don't think you need to render geometry separately in layers.

Comping FTW!