I really like those ideas ...
but it still has that repeat of ANH - so to enhance this, maybe our heroes find/capture a prototype to battle the new DS?
at least this would scrap another "we need to fly into/through the trench" solution and making it an epic conclusion (if we decide to stop and not continue with Episode 7-9)
must meditate on this new events ;-)