It sounds like your shrimp are maturing and are both the same sex. The fighting will continue till one is dead.

By rearranging the aquascape you have broken up the territories which has stopped the fighting for now. Once they establish new territories it will begin again.

I would say that your shrimp has no chance to recover if kept in the same tank. If one was removed then he has a chance.