More Variations

Okay, so I have 2 sentences. They should mean the same thing.

私はたぶんあなたに会えるまで元気にはならない。

私はたぶんあなたに会わないと元気にはならない。

The first one was an example I got from weblio since it has lots of examples.
It's supposed to mean "I probably won't cheer up until I can see you."

But that's also what the second is supposed to mean. The difference as you'll see is that I changed it to use ならないと. So, was my change in the sentence correct? And which one to use if that's the case?

The former more focuses on that the current situation (元気ではない) continues until I see you, whereas the latter is more on the change "I'll cheer up when I see you". The difference is subtle, though.