I'd have to look at it. The first problem you describe is 100% in the core's position. The other problem could be a result of coure alignment, or it could damag to the header panel or headlight frame.
If your man has a half ounce of mechnaical aptitude, whether or not he knew before, it will be clear after you explain it. How happy he is going to be will be intersting because explaining what needs to be done is one thing and doing it is in a different ballpark. I'd rather be in the explain ballpark than the repair one. Then again, I hate working on f/ing cars, so my point is moot.