The thing is these arcs could have been achieved without diminishing the characters. For instance Han could have been using his old skills/contacts to recruit potential resistance allies. That way TFA could still have him separated from Leia and acting somewhat like the Solo of old, but with noble purpose.
Similarly Luke could have inadvertently ‘created’ Kylo Ren through the training process but, instead of giving up in despair, could have realised that the old ways were no longer adequate. His entire ‘hobo’ routine with Rey could have been a ruse - something like Yoda’s initial test/demeanour in TESB - that was designed to push Rey into seeking her own destiny rather than being trained in the traditional way. The ‘subversion’ could’ve been at the finale when Rey (and the audience) realises that Luke was guiding her all along. That way we get a subversive hobo-Luke without sacrificing his arc as completed in ROTJ. Plus it would explain why there was a map…
Oh, and Leia’s ‘Jedi moment’ should’ve been lifting those rocks for Rey and demonstrating that Rey still has much to learn.
Bingo