Rebatched soap has seperated and isn't setting

I'm new to soapmaking. I made a batch of soap and left it to cure for a good 2 months. It set really well but I wasn't happy with the fragrance as it just smelt of the oils I used really, so I re-batched it. I think I used too much water, as now the re-batched soap has separated into two layers- the bottom is a gloopy gel and the top looks like a few centimeters of the oils/fats that I used, and it's not setting. I can use it as a gel soap (scooping it up with my hands out of its tub is quite good fun) but I still have two full tubs left over. I was wondering if there was anything I could do to the rest of it to make it set again ?