I'd just take it somewhere and let them rebuild it. That way, you have no fit issues. I replaced my Valeo with a Valeo and the plastic housing around the B+ lug was different, had to struggle and cut the plastic to get the lug on.

Two months later, it died, got a free replacement - this one just went right it - the plastic housing was the same as the original.

If you can do without the car for a few days, let someone (who is known for good work, not cheap work) rebuild it.