Switch near match to use better hook

- We're the only user of SearchGetNearMatchBefore, which I'd like to remove
- We don't actually check other variants, despite our claims in a comment
- By using the later hook, we get to check all variants plus let MW title
  munging have a crack at things first

Change-Id: Ie3ca6393a9c8699a8d2979446adc5e0cef304616
Merge "Switch near match to use better hook"