If the headers don't fit right the bastards would have them back in no time at all. There is no excuse for them not fitting other than if they just didn't have them in the jig correctly, and if so that is their fault, also. Sounds like you're getting close. Don't compromise on anything, you've done too nice of a job to hack any other parts.