A way to make combat better would be to make the plot related fights winnable. Here´s how:
In the sanctuary instead of the sorrow showing up at full power, it´s a weaker version. It would still be a tough fight (like the lovecraft thing in the cage back circus minor) once it´s defeated the crisis ends (the sorrow monsters disappear with it. The bridge is still destroyed and the pyramid has to be used to evacuate the survivors.
In the bloom, when trying getting acess to the hearth instead of infinite monster spawns, it´s a set number depending how many times the player used the transdimensional scapel to open maws. 3 if none, 5 if used once etc.
In the fortress the sorrow shows up again just like last time. Once defeated, a stronger version shows up (50% more hp and buffed up). The First and her minions could be conviced to keep fighting or just activate the chamber. When defeated again the ressonance chamber is activated.
Mechanically, maybe give jacks and nano weapon skills. The nano would be restricted to the light weapon skill while the jack could get two weapon skills but can only spent one point (to make it an actual jack-of-all-trades).