With the introduction of shields might be a perfect time to add more depth to how combat plays out though.
Doing it at some points after shields are added instead, would probably not be the best choice. Sure, it'll work to test the shields out in whatever way they do want to put them in, but it...