Require Membership on Contribution Pages only when not currently a member

The require membership feature on contribution pages is an awesome idea. The issue that if the user is already a current member, it forces them to renew no matter what the status. I got around this (sort of) by creating two contribution pages and in the renew portion of the one requiring membership, there is a link to the a copy that doesn't. The problem is that if the user was ever a member, they will be able to get around this. I think that current membership should allow the requirement to be skipped.