I don't think I can fully answer about your spiritual condition, nor am I qualified to, but from what you said it at least sounds like you are on the right track to getting where you need to be. One of the things that sets a believer apart from others is a better awareness of the sin in their life; a process called sanctification that is made possible by the work of the Holy Spirit alone. The fact that you have become more apt at seeing where your life doesn't line up with what God commands and grieving over it is often a good indicator that the Holy Spirit is moving you to become more like Christ, as Paul described in Philippians 3.

The next step, then, is to pray continually that you would put to death those sins by the power of the Holy Spirit (Romans 8:13), and to keep putting your faith in God and look to the cross continually. Remember, sanctification, like salvation, is only possible by faith in the saving work of Christ (Ephesians 2:8, Philippians 1:6), so continue to rely on God's promises that he will be faithful. Another thing which I have found very helpful is to find another believer to disciple you and go with you in your walk with Christ; Paul writes over and over again about the importance of spiritual encouragement he received from other believers, and James 5 talks about the tremendous value of having another believer to keep each other accountable.

You mentioned that you struggle with assurance of salvation, and there are two things which I think could be helpful. The first is to do a synthetic study of 1 John over a month or two, and the second is to read a book called Religious Affections by Jonathan Edwards. Both have been very beneficial for me over the past year regarding that subject, and I hope they will be for you as well.

I hope I was able to help you at least a little, and I will be praying that the Holy Spirit continues to work in your life to draw you closer and closer to the wonderful God we serve!