If your removing the front panel...... Id trial fit everything on the front end once a tack weld or two is holding the new panel in place. A lot of mk2's dont line up properly due to either non genuine panel replacements or not enough time spent aligning/trial fitting. Spoils the finished article and will drive you mad in the long run If it isnt spot on.
Nick.