The feat restriction can be bad if things like this happen. But I can understand this problem occurs because of FA optional rule. With normal archetype rules this can be avoided.
Since you are stating that's not makes your character OP I can give a try.
Thanks.
