Yes your too much water is bad for your relationship with your mother especially when 巳亥 clash. Your BaZi shows that you will argue with her a lot but later when you calm down you regret what you did.
You have a very concern mother. Listen more to her and try to use this to train your patient. This training will help you a lot in all your future undertakings. You do not need to follow and do all that she has said but she would be able to give you some good advice.
It is good to let her move in with you again you need to live in harmony with her. You can be temperamental and lose your patience and this provide a good time for you to improve. All mothers always regard their children as kid and would wants to make decisions for them. This take time for them to change; talk to her nicely and she will understand once she notice that you able to make the right choice.
Cheers.