You would have to then turn off the lock completely. As once you have one set, it will be there (come back) every time the screen goes dark.
There is no way to set it to only do that once and then every other time just be the swipe. You can either have it as you do now. Lock and also swipe. Or you can have it as swipe only, no lock.