The final conflict between Erik and T'Challa deserved a much better staged, choreographed, and rendered fight. It deserved a much more imaginative conclusion too. It really does suck that such a brilliant final showdown between cousins, ideologies, and instant classic characters didn't have a set piece that lived up to the weight of the build up and beauty of their final moments together.
I do like the visceral and raw brutality of the waterfall fights. Those didn't need to be sleek or sexy. And I was cool with T'Challa getting his ass kicked. This was an emotional ass journey for him and for his first solo outing, I thought emphasizing his vulnerability was fitting.
But that final fight, and even portions of other fights will be the things people look back on and say couldn't keep pace with the top notch acting, music, and writing.
Everyone involved has to step it up for the second one, especially the CGI houses. And you're right that they should stop relying on that kinetic energy blast and make sure his second outing, now firmly established as King, has a lot more bad ass moments like this.
They emphasized his vulnerability while building him up as a man learning to be King in Black Panther 1. Lets emphasize his strength, swagger, and intelligence next.