Yes, sounds like you hae already made a decision in your mind. But becareful! If it didnt work out before, it will most likely not work again, no matter the situation.
I read a really good book called 'Love the one you're with'. Its definitely worth a read for you in this situation. You could be letting something go that is worth more than you can see. Especially while you are being blinded by a crush who you have had good memories with. Thats what i think is probably happening. Ultimately it is your decision but just choose wisely. Good luck!
You have all the weapons you need... Now fight!