^^ Udpate to the update.
Car still felt a bit "funny", ie butt dyno thinks things were a bit lean. Hooked up my scan tool, both LT and ST fuel trims were all over the place. Installed an 08 STI fuel pump assy I got from Hicksta today, immediately noticed an improvement. Scanner shows fuel trims much more stable and near zero.
Current hypothesis, reloading the ECU map reset the LT trims which made the initial improvement. Car has 138k miles and it appears to be the original FP. Lots of junk in the sock and bottom of the cannister too. Hopefully this is the final fix, I was really mulling the reasoning behind reloading a map only to fix problem.