Sounds perfect, with two minor caveats:

The moment when Rey one-ups Han Solo at fixing the Millennium Falcon is cringeworthy. Rey can be talented without outshining original trilogy characters.
Ending The Force Awakens before Rey finds Luke is the equivalent of ending A New Hope before Luke blows up the Death Star. Finding Luke is the central goal in The Force Awakens, just as destroying the Death Star is the central goal in A New Hope. Every complete story must answer whether the hero’s quest ends in success or failure.