To be fair some models change during their lifetime and no wiring diagrams can be deemed as accurate as alluded to by PEG in his articulate and accurate post.
You need to go to someone who is clued up on this model and has access to the appropriate diagnostic equipment and relevant diagrams ,and has the mechanical knowledge to correlate between the two; in the light that yours is now an unknown quantity by interference of an unsuccessful third party ;to put it kindly.
The mechanical condition of your engine will also influence just how much your ECU can do. No MAF sensor in the world will compensate for poor compression and cylinder and valve condition.
The history of your head and water pump problem may also be influencing the symptoms you have.
We all seem to be singing from the same hymn sheet in our advice to you, you may find more advice on a dedicated forum if you google your problem, but as far as I can go is what I have already said.
(not speaking for the others)
PEG summed it up in my opinion, you now need 'hands on' help, by a professional.