I agree with your sentiment that they over did it. I feel that too... but it just doesn't ruin the movie for me. I get why they did it. and yes, I do think they did it on purpose because they have an agenda to move future movies away from the Jedi & Sith religions... & as such, you cannot bring in a happy go lucky & perfect life Luke. If you're going to explain why the Jedi must end, you have to show a Luke in which the Jedi teachings did not work out so well for.
Again, I'm not saying that's the best route to take or that I would've went that route myself, but if you're going to move the platform away from Jedi/Sith then you gotta do something like that. I think they could've achieved it without being as hard with Luke as they were, but I do understand why they did it & I'm fine with it. It is what it is. I can look past my pretense & accept it for what it is.