That is not the only two viewpoints...just the two extremes I think.
The third is in the middle. Jesus' death and ressurrection gives us forgiveness, then the work of the Holy Spirit keeps, protects, and guides us in living as Christ lives and how we are meant to.
Philippians 1:6 (Amplified Bible)
6And I am convinced and sure of this very thing, that He Who began a good work in you will continue until the day of Jesus Christ [right up to the time of His return], developing [that good work] and perfecting and bringing it to full completion in you.