What you have listed does not sound unreasonable. I think you are being very wise in taking time, and not jumping back into a relationship where you feel unsafe.
It is not about what you feel should work in your M. It is about doing the work that gets the right results. Do what works!