I just finished playing your updated version!
I like how the combat feels more in this version; with the fact that energy takes longer to recover, there doesn't really feel like a cheap way to fight the enemies, and there's a reason to learn how to play each character. Since you do have to spend some time playing as each character, I think it's a good idea that both of them can fill the roles of the other. However, I feel like the effectiveness of these secondary roles should be adjusted. Sword's block appeared to be just as effective as Shield's block in reducing incoming damage, making him feel less valuable. In contrast, Shield's melee attacks felt extremely weak, having poor range and only doing a single point of damage, which isn't even enough to break the save stones in one hit. I feel like he could be boosted a little bit in this area. Shield's special parry move when swapping to Sword felt very good and played to the strengths of Sword's character, giving her an opportunity to land some free damage. I'm not sure what you could do with Sword's special move, but I would be really interested if it somehow played into Shield's abilities as well.
You might think that the game feels too easy, but I don't think that there's enough content to really judge the game on its difficulty as of yet. With the complexity of the game mechanics, it's important to provide an ample tutorial to allow the player to become accustomed to the controls. If you continue to add new content to this game, I think it would be reasonable to gradually raise the difficulty curve.