I still want to lean towards the maf sensor or circuit that is causing your problems. From experience, research and watching others a bad maf, wrong maf, different size housings, or messing with the sample tube can cause the strangest running conditions. I heard you mention a electrician, maybe...