Until we find out Saw’s missing scenes we won’t know how this thing really got a bit muddled especially at the start of the film.

Basically if and that’s a big if Saw had scenes on Geonosis then that could change everything. Either it was a flashback or it was done like a prologue and then the main titles.

I think if it were Flashbacks though then the original opening of the film put’s the first shot of the film as the Death Star Dish being fitted that was originally the opening sequence. We then would cut to Yavin and Jyn in a cell there.

This was at one time a possible configuration.

Opening Crawl
Death Star Dish is fitted (True opening to the film Wow Factor shot)
Krennic bumps in to Vader on the Star Destroyer with Tarkin “The power we are dealing with here is immeasurable”
(Yavin IV) Jyn in a cell (Flashback to Galen on Lahmu)
Cassian (Planet X) Ring of Kafene
Yavin IV Reveal as Cassian’s ship returns home
Jyn Marched out in Shackles
Recieved an Imperial Coded transmission Mon Mothmna Bail talk with Jyn a mission is Launched
Bail and Dodonna in the Hanger talk to a large group of Pilots
Jyn Cassian and a squad of x-wings go to Jedha. (Zal Dinnes)
Bodhi Rook Defects

This totally does away with the need for place names of the PLanets and would be told in a traditional Star Wars style.