I'd say you're on point and I'd also say that the Watchtower did a very good job of making Jehovah's name known, I mean there's quite a number of people out there that know of Jehovah's name due to the Watchtower and are familiar with prophecies so that when they see these prophecies coming to pass I would imagine a great crowd of all the nations will call on the name of Jehovah whether they are baptized brothers/ sisters or not, I suppose at that time they will be baptized with fire meaning they came through the tribulations being faithful to Jehovah and especially in view of not accepting the mark of the wild beast.
Exodus 12
37 Then the Israelites departed from Ramʹe·ses+ for Sucʹcoth,+ about 600,000 men on foot, besides children.+ 38 And a vast mixed company*+ also went with them, as well as flocks and herds, a great number of livestock.
Corinthians 3
13 each one’s work will be shown for what it is,
* for the day will show it up, because it will be revealed by means of fire,
+ and the fire itself will prove what sort of work each one has built.
14 If anyone’s work that he has built on it remains, he will receive a reward;
15 if anyone’s work is burned up, he will suffer loss, but he himself will be saved; yet, if so, it will be as through fire.