In repentance unto salvation we must also turn from the idols, that have kept us in our own will in order to turn to Jesus and the will of God. This is true saving faith that causes us to change our mind from our own selfish will to turning to God and believing Him enough to say God your will be done. This is just another way to say what you just said that we must repent from self righteousness, trusting our own way and repent of our own righteousness. This is what is meant when someone says that you must repent and trust alone in Jesus Christ for your eternal life. Repentance and faith go hand in hand.

I agree there are two types of repentance, we as believers must also repent of daily sin. We are still sinners and do not lose our salvation when we are struggling against sin. We will live the victorious Christian life if we do struggle against the sin and crucify the flesh.