Yes, he can stay. Loved Rogue One. But didn't they essentially take the movie out of his hands at one point as well?
https://www.theverge.com/2017/1/15/1...ds-tony-gilroy
Gilroy came in and cleaned up a lot of stuff with reshoots. Reshoots are often thrown around like rebuilding or tanking in sports (could mean 6 different things as all movies do reshoots) but Gilroy according to most reports did some heavy lifting.
But the story choices were solid. I could have completely done without Vader ripping through a hapless column of rebels. Leaving him stranded on his ship having to chase would have been connection enough, for me, to Star Wars.