I haven't got a wealth of experience, but how I have been doing it is to use a 3rd pin and sanding where needed to forcefully align it.

How I would approach it looking at your picture is to sand...