Humm.....I think you shall not let some cards determine the outcome of this question, but rather investigate your own heart...because that is what counts.
It is a fact that people that hurts their partner, often promise never to do it again, but seldom manage until they agree to get help.
Now...I have no clue what he has done to you...and that is not important for me to know either....what the important thing is that you was feeling hurt.
You say you still care for him a lot....then one way to go is to try out as co-habitee....BUT make it so that he move in to you, so you still have your flat and ownership if you ask him to move out again.
Depending on his violence, I would also put up requirement for him to seek help.
If it on the other hand is "unfaithfulness" that hurt you, then it is very important to ask yourself if you are able to fully forgive, and not carry it in your thoughts.
Our brain is our strongest tool, and if we have a little thought nagging back in our heads, then we can destroy even the most "truthfully" relationship, due to questions and mistrust.
The main thing is that you keep the control both over "flat" and your own economic situation, then if he again make you feel hurt, you have the option to ask him to leave.
I would not suggest any marriage until he has shown more stable behavior.
But ask your heart if this is really something you want, if you go on with this relationship then you close out option to find "the real prince", so let it be your heart that speak, and not your loneliness (not saying you are)
Good luck
