The FD appears in the photos to be a few mm too high. It should clear the large chain ring by 1 to 2 mm. I agree with the 1 to 2 degrees of rotation.
As a last desperate measure before you replace parts, I would try "modifying" the FD cage. Use adjustable wrenches to bend the outer plate a fraction of a mm, see if you can get the right clearance in the right spot, and still retain shift quality. I've done that on cheaper bikes and components, and would never do it on someone else's or a client's bike.