Semantics. 
"He that believeth and is baptized shall be saved"....
Meaning, when the rapture takes place you shall be saved. It doesn't imply that there's another step.
Jesus was speaking to the disciples in that verse, and He wouldn't give them step one and not give them step two. He said exactly what He meant.
Again, it's SIMPLE.
"He that believeth and is baptized shall be saved; but he that believeth not shall be damned."
SIMPLE!!!!
Totally agree with you. Semantics.
I am making a point that the "shall" points to a time period between baptism and being saved.
You say "when the rapture takes place you shall be saved". You reference the same space of time I do, unless we go straight to heaven out of the waters of baptism.
A space of time where we must work out our salvation.
Philippians 2:12Wherefore, my beloved, as ye have always obeyed, not as in my presence only, but now much more in my absence, work out your own salvation with fear and trembling.
Salvation and being saved is goal that we work at everyday. I merely am pointing out our work doesn't end when we come up out the water.
Luke 24:49 And, behold, I send the promise of my Father upon you: but tarry ye in the city of Jerusalem, until ye be endued with power from on high.
And the work is easier when using the power from on high...
I argue to argue so forgive me if I offend you.