Daniel, my short answer to your complex question that surely deserves more time and discussion is that if this woman broke you once, there is a high chance that she will do it again and again. My rule of thumb these days in response to dating advice is this — don’t count on change. Count on more of the same. Don’t invest in someone’s potential. It’s the old carrot trick and excuse for abuse. Instead, invest in you and your future and the right person will come.