Exactly. 'That's great; we can resolve that issue easily. Let's just skip the non-compete - you're not using it anyway and I'm not comfortable with it.'
EDIT: A non-lawyer's suggestion (talk to a lawyer before you do this): Skip signing or edit documents (cross out and initial sections you don't like, add words - and initial each change) and then sign and send it back. Don't say a thing; leave it to them to bring it up - most people won't bother disputing it with you.