Move Extra Panache from level 7 to level 3 and take Lunge at 7. Problem solved. Extra panache at lower levels to be able to Parry and Riposte more often wouldn't be a bad thing anyway.
Oh, and I'm making a very similar build to this for PFS except I got my hands on an Ifrit boon to use for my buckler of swashes.