Does champion mastery need more time fixing?

For starters, i love the new mastery system, it lets me really have a goal in the game besides buying all champions/runes. Being able to show off your mastery is also really amazing. However, i do also believe that the mastery system is not solidified yet. It is my personal opinion that there are many things wrong with it when it comes to distributing points. Let me give some examples:

  - Probably the worst problem with the mastery point distribution is the WIN/LOSS account. Again, my own opinion, but is i'm trying to master my own champion, the points i get should be based on my OWN performance. I hate to see players who just aren't too great with the champion they're using yet, but then get tons of points when they win. The same goes for a player who really tried and really did well with his champion, but got almost no points for losing. I believe that the amount of points a player gets should be based on Minion Farm, Towers taken/assisted in taking, Dragons taken/assisted in taking, presence in team fights, and of course, personal score. Now i do see an issue with this. Many may think that players will go insane for kills and steal as many as they can just for mastery points. but there is an easy fix to this. The personal score of an individual should not account more than objective presence and such. With this at hand, players will try to gain objectives and more, instead of just striving to get the highest/best score.
    
       Now that the biggest issue is discussed, we can talk about the smaller issues. 

• The whole ranking thing is starting to become like lolking scores. players will discriminate others, or show off the rank that they received. Now to be fair, i've only seen this about two times thus far, which is why i don't see it as a huge issue
• Honestly, any suggestions past this would just be complaining.

Thank you for reading this long post, i do appreciate it. I am however not a perfect human being, and i might be wrong about some stuff. Tell me what you would fix / tweak in the mastery point system.