Kills only count when the player who got the kill scored the point correct?
Also i suggest making matches much longer. I was playing matches to 21 points with friends at my server and it only took like 5 minutes. Maybe you can do 21 point games and best 3 of 5 games to win. That should make matches around 15-30 minutes long