How about this Calvinistic idea? God's has his plan for salvation of all believers that he decided from before creation, while all believers have full responsibility to choose God to be saved. It is a mystery how those two biblical truths work together, but they do.
Choosing God is a choice that only those who have been born again spiritually will make. The natural man, according to 1 Cor 2:14 will not, and indeed, can not choose spiritual things, thinking them to be foolishness.
Salvation, in your first theory, according to Strong's concordance, means deliverance eternally, and saved, in your second theory means the born again person is delivered from not believing in spiritual things
