Does Champion Mastery Need a Rework?

This is just an opinion/thought but does anyone else think that Riot should tweak the champion mastery point system a bit? What I'm talking about is how the system gives points for the mastery ranking. Granted you do earn points for performing well but even then you still don't get a decent amount if you lose the match yet you could do terrible in a match and the game and still get moire points than the one where you played the champ well yet lost all because you lost the match. It goes against what Riot's idea was with champion mastery which was to motivate people for doing well on a champ but all it does create an annoyance since it appears to be another reason to win. Granted I know that the point of the game is to win but not for champion mastery. Not to mention there those who are rank 4 or 5 on a champ because they got carried and got a ton of points for wining and are complete garbage on the champ with rank 4 or 5. I know this because i have gotten carried with a bunch of my champs and got a ton of points for even though i was complete shit with the champ i was playing, but i felt as though i did good because i got the from wining, not because i performed well on the champ. So that is why i think Riot should take a second look at champion mastery and actually reward points for playing well not because you got carried by the guy that actually earned the points for rank 5. Feel free to say your mind on the subject whether you agree with or not and if not why? I want to see if I'm not the only who thinks or if i am just complaining about the system.