I think you've got some of the narrative backwards. I think Luke gets instructed by Yoda before he gets his arm chopped off, not after. I also recall the idea that in the first encounter Vader wasn't so much looking to give him a good hiding as looking to test him and attempt to convert him to evil.
For me though the thing that saves Luke from being a shite character in quite the same way as I think Rey is is the fact that he had multiple failings and often screwed up (I don't think he was amazing character, just a better one). His impulsiveness and stubbornness gets him into trouble, he gets tongue tied when he fancies people, doubts himself a lot, he whinges and moans, folk get the better of him. His mates genuinely help him out of difficulty on numerous pivotal occasions and there is no way he could succeed without them. His faults and their consequences are demonstrated to him as the films progress and through them he develops as a character. He does unbelievable hero stuff, that's true, but it's not his whole story.
I genuinely didn't get that sort of impression from Force Awakens. It just seemed to be a fait accompli that Rey would be better than everyone at everything all the time. If she'd occasionally got bailed out at an important moment or two, demonstrated a weakness and had her character improved by another person I'd have been happier with her but I can't remember an instance where she was. I don't mind a couple of acts of unbelievable heroism, I just prefer to witness examples of fallibility in other areas in order to compensate. In reality all I can remember were demonstrations of the ineptitude of others and those characters being improved by Rey.