Try to get the motor to idle very lean. The idle circuit adds fuel from idle through cruise. Even at WOT it still adds fuel. I would say forget about WOT and tune idle and cruise first. Keep jetting down the primaries until it stumbles at cruise then jet up one size. Then adjust your PVCR's for WOT.
My engine will cruise below 2000 at 15.2, and cruise at 14.7. You should be able to lean your out more. Maybe even try a 32 on the HSAB. The smaller the hole the earlier the main jets come in.
My specs are with a 3 circuit:
76 IAB| 32 HSAB| 35 IFR| .065 TSR| .0935 PVCR| 76/92 jets.