Finally got around to seeing this movie. I liked it better than the first two, although a few scenes did drag and I did shake my head at a few things. I enjoyed the one-on-one battles. They were the only real tension in the movie.
A 6 episode season doesn't give much time to cover everything.
As for Charlie's turnaround, I read an interview with the guy who plays him, and he said that Charlie was doing what he was doing in order to keep the company alive to fight another day.