I rather just not have Daigoro be part of the cup portion. On a psychological level, when the presence of reward exists where barring opportunity nothing is invested, the absence of reward is enough of a punishment for choosing incorrectly. Having one cup with the chance of doubling your earnings, and two cups that do not, is sufficient and more in spirit with what the Gold Saucer is, or at least should be.

People are more willing to accept the random nature of Any Way the Wind Blows given its volatility from the onset. Of course that has some ways of drastically altering your success rate, though I blame that more on implementation specification more than design intent, and won't be surprised to see that revised next.