Sorry if this was mentioned already but did you check the fuel pressure at the fuel filter or at the rail? I'm sure you did this already but wanted to ask. I don't think you're having a fuel pump issue because it'd be across the board, even if you had a dirty fuel pump sock.
That's a good find there amigo, wet TCM connector is no bueno. If you haven't already, check the NSS just to make sure it's clean and tidy. You know, while you're in there :flipoff2:
@BakerFJ nice job amigo, a really detailed and methodical way of approaching your issues. I also like the way you write and emphasize as it totally works with my mind.
I'll just sit back and not be an armchair Qback! :popcorn: