On the switch there were only two of those walls that I hit, I didn't really do any grinding outside of those points. It turned out the first one had a trick to beat it, grinding didn't actually help that much, and the second was the final boss...