Hmm. Difficult one.
Basically though, I agree with the proposals.
This system was designed in the days when married women stayed at home to look after the kids...in the UK, hence their lack of sufficient NI conts of their own. Divorce wasn't as common in those days either..