Dan, make sure your front/width profile is absolutely spot on first, except for a little extra width in the tips perhaps until alignment is verified, otherwise, if you start trapping and faceting with uneven widths/wavy edges, it can throw the whole works off.
If you go back and take the wavyness out AFTER you trap and facet, it will change their proportions, then you have to fix the trapping and facets anyway... so, better to bring the width to very accurate profile first. Maybe it already is, I just thought I noticed a few little spots so thought I'd mention it. Carry on.