I think the O.P.'s order is the best. If you’ve never read the original rationale for the Machete Order or it’s update in light of the sequal trilogy, check it out:
https://www.nomachetejuggling.com/2015/12/28/machete-order-update-and-faq/

The originator of Machete Order, Rod Hilton, actually suggests approaching Ep 1, Solo, Rogue One, and the shows as Anthology material to be watched in any order at another time than the other main eps. because they don’t directly serve Luke’s story.