That's how our group solved this problem as well. Seems like a reasonable thing to do since otherwise, as you said, you often start off by drawing and immediately discarding with no effect. We have also played it so that you draw until you get an Item (something you can keep), and we have not...