I don't want to be the bad guy but...?

I think you should dump your current gf and maybe hang out more with your ex, see where things take you once again. The relationship with your current gf is only going to get worse, and right now the fact that you're still in it is just a waste of time. Do what you gotta do to be happy.