Disney could offer two 3-hour sessions, similar to the way they previewed it for the press and influencers. AM session that starts at 8, goes to 11, and the PM session starts at 12, goes to 3, starting with a the orientation of the ship, then a staggered schedule of brunch with Gaya, light saber and bridge training, engineering room activities (don't want to give too much away in case they do this), and guests are free to come and go to the bar/lounge, store, and discover the ship. After each session, a guaranteed entry to Oga's and optional droid build. Transports can begin an hour before the starts from Batuu or you can use the valet option from Earth, if you don't have a park ticket. This still leaves the guest a lot of time to explore Hollywood Studios, if they would like.
We spoke with some of the bartenders while we were on for our final voyage, suggesting this, and they said that this was already in discussions with their leadership and executives. Essentially they were inquiring as to guest behavior and if they think the compressed experience would work. I believe writing off the loss and rebooting it like this might prove more valuable and sustainable in the long run. A girl can dream!