I don't really think this fixes the gold trimmed requirement, potentially this makes it even longer. In the past it didn't matter if you lost, you were still progressing to your trimmed comp requirement, now if you lose you lost out on 20 minutes you could've been doing something else.
I propose 3 for a win, 2 for a draw and 1 gold ticket for a loss.
Also, is it possible to make Castle Wars instanced so that when the official worlds have 200 people down castle wars, half of those aren't stuck in the lobby until a spot opens up?