Well, the opening flash-back has a bald Whitaker, meaning that it most likely was from before the re-shoots (trailers had a bald Whitaker on Jedha as well). And from what Edwards has described it seems that it was Jedha, and mostly Scarif that was re-shot.
There is of course the whole thing about Edwards initially assuming that Disney wouldn’t let them kill off all the main characters, but I don’t know if that only affected the script or if they actually changed the shooting of the Scarif scenes that drastically.
Why does so many people not like Bodhi? I though he was one of the more identifiable of the characters. He has much more character development than say, Chirrut (which has basically none), and even Baze.
Out of all the characters, I definitely think Bodhi was the most developed. He had the clearest character arc; an Imperial defector who finds new life in the Rebellion and eventually gives his life for the cause. Baze also had an arc, but it was more of a sudden turning point than an arc that was subtly built up over the course of the movie. I got the impression that they were supposed to be secondary characters, and that Jyn and Cassian were the real protagonists, but at the end of the day I liked Bodhi, Chirrut and Baze a lot more than either Jyn or Cassian.
Like I said I don’t remember any of that shit. Perhaps my 3rd viewing will give me clarity.