Yes, that sounds fine, though I would actually advocate on essentially removing access to both of the cards used in generic resource generation, since players shouldn't be able to benefit too much from this mechanic. However, if we did leave one of the cards to be discarded, that would create interesting combinations as well.