Awww Mandy/Bubbles--I totally feel for you.  

. My ex--whom I had went out with for four years--and I went through a lot togehter--including the almost exact same situation to which you are describing.  It was a total up-and-down relationship--where he also tried to "hook" me, and "make things better" by proposing.  Anyway--that didn't work out--I'm too young for marriage!  
Anyway, I will email you for further help--we seem to have experienced the same things!  Take care Mandy!  
Caitlin