Really agree with that there should be some change about that. The way it is right now with a leaving player just changing to all auto discard is really ruining the match.

I think point 2 and 3 from your list would be good solutions to fix it especially the second one.
Point 1 would be not as it is too easy too abuse that as you mentioned yourself already.