This was probably answered in a round about way. But for future reference, while the injection manual does not state explicitly which is which, all instruction pics on show the early one in an early car with plastic tubes. So, the other must be the late one (and that's the one on the right in the above pics).
Rob,
Did you get the not getting to WOT issue resolved. After reading your issue, I decided to double check on mine and i was not getting to WOT either with pedal fully down.
In my case, it turns out there is a bit of play in the system that I needed to take out. After confirming that pump was correctly synched at idle and WOT with the throttle, I disconnected the safety clip at the firewall bell crank and removed the pin to decouple the vertial linkage from the crank. I then pressed down lightly on the crank to take up the play (throttle nor pump crank should move), screwed the pin down a few turns to fit into easily into the pressed down bell crank. This took the play out of the system and now I have WOT with pedal fully pressed down.
ANd, one more question -- you started the thread with the issue of not getting to WOT. So, when you say you are only getting to 15.x AFR at WOT is it truly at WOT or at pedal fully down (but not quite WOT)?
Byas