Headlight bucket time! In studying the whole front end, I needed to recess those headlight buckets and also extend the cap a little bit further. This added the extra lip I needed as well as the angle now being correct.
Every little step is a big move forward. This took a good day to get it right. I'm describe it more in detail once I get it fitted up. More to come!
Cheers

Dave