You mentioned you were going to file the wafers to fit.  That makes the lock
incredibly insecure.  Re-arrange the wafers to be correct, then replace the
ones that can't be re-arranged.  We stock the wafers and will either rekey
the lock for you or sell you the parts if you want to do it correctly.
There are web sites that say to file the wafers down, but that is just not
the way to do it.
Regards,
Steve Sandlin, Registered Locksmith
Steve's Lock Shoppe
http://www.steveslockshop.com
vanagon.com recommended vendor