I agree with what you are saying, but the next thing you have to address is how are those that never heard the gospel, how are they given the chance to hear it and be saved. When will that happen?
Was it when Jesus died and descended into hell and talked to the spirits there? Perhaps He shared the gospel with them...or do you think perhaps there is another way? What was the proclamation made to the spirits?
1 Peter 3:18 For Christ also suffered once for sins, the righteous for the unrighteous, to bring you to God. He was put to death in the body but made alive in the Spirit. 19 After being made alive, he went and made proclamation to the imprisoned spirits— 20 to those who were disobedient long ago when God waited patiently in the days of Noah while the ark was being built. In it only a few people, eight in all, were saved through water, 21 and this water symbolizes baptism that now saves you also—not the removal of dirt from the body but the pledge of a clear conscience toward God. It saves you by the resurrection of Jesus Christ, 22 who has gone into heaven and is at God’s right hand—with angels, authorities and powers in submission to him.