Hey,
That will probably be the best for putting the front clip back on anyhow. The one piece removal worked but it wasn't the most careful and meticulous method

.
Anyhow, maybe you are working on it but the pics don't show for me here, I saw them on the PT post though.
Pretty impressive stance you have there and the progress is remarkable.