Having a 40 card main deck is only important to those who believe in things like "card advantage" or "deck thinning" or "geometric probability" instead of THE HEART OF THE CARDS.

That said, I think the latter option would be the most appropriate.