Suggested resolution:

Change in 12.2.2.3 [over.match.oper] bullet 3.3.4 as follows:

• do not have the same parameter-type-list as any non-member candidate or rewritten non-member candidate that is not a function template specialization.