The water pipe is large and sits underneath the intake mani which is why you haven't noticed it before. The left side connects to the upper radiatator hose, follow that back and you will see it. The spade connector is temp sensor part 22630 AA040 or 22630 AA041. That is the part that will connect to your ecu. The other sensor is gauge sensor 21203 AA030. You want the spade connector.
If you want zip files of the factory service manual and/or complete parts catalog pm your email and I'll send them to you. They are very useful and informative.
The MAF can be a problem, but it probably isn't your problem. If it was your car would run like crap all the time or not at all.