I personally don't believe Weaver/JH ever planned on preventing JDay, but who knows?

I tend to believe Weaver when she says she was building John Henry to stop Skynet. She and John Henry are basically the metal versions of Sarah and John, so I do think they wanted to stop Skynet. I just don't think her plan works out in the end. Also, metal does not save the world in this story!