We broke it off....
After an insane emotional roller coaster, we ended up agreeing to just go back to being friends.. Turns out I can't handle being a secondary and she couldn't handle me being a primary. Or at least she didn't think she could..that was really never given a chance since the rules never changed before things ended.
On the upside, our friendship is back to he way it was and we're all on good terms. I also moved to a different state, so I get a fresh start. Yay!