If you love each other and want to stay together, just focus on making things better. It might help if you set down some rules, if not together then at least in your own mind, like:
-If you see an argument starting, just quit: it's not worth it.
-Don't raise your voice and yell.
-Take a number of days per week that you think is fair to see your friend or for yourself.
Don't forget relationships take work.