1999 to 2007 Front Bumper Conversion Question W/Body Alignment

[bimmertrek]

Hi Guys,
My 02 SD is at the body shop getting its 07 front end installed and painted. Header panel, grille, and lights are all on. Bumper is not really aligning properly though. Looks like it needs to go back slighty further (towards rear of truck) so it aligns with the front fender arches, and sides slightly flare outwards. Anyone else have this issue and how did you resolve it? Parts are aftermarket but I know a few people here have used aftermarket and they've been fine.

THANKS!