Ok at this stage this is what ill do:
Ill take it for a spin tomorrow (its midnight here) and find out exactly whats rubbing on what in each of the gears.
Get it in for a service asap, ill mention derailleur rotational angle.
If its still not right then, ill look into shifters that don't have indexed front shifting and where I can trim the front derailler cage.
And only after doing all that will i look into upgrading derailleurs, chains etc.