Yes, that's the reasonable, rational solution...

Then, I go further out by thinking Marriage Licenses (or civil union contracts, whatever they're called) should be renewed every 5 or 10 years.

What other important license can you get that is valid for life? Hell, even fishing and hunting licenses need to be renewed! But Marriage is always valid?

Now, granted, that would take some work for fair distribution of property if a couple lets their license lapse or just don't renew, but would it be any worse than divorce law?