McGregor is also the right age where you could probably get a whole separate midlife Obi Wan trilogy out of him before dovetailing into A New Hope. Maybe have Bail Organa send him on a series of smaller adventures that only his Jedi training would be suited for to aid the fledgling Rebellion?