N60 MAFS replace with n62 MAFS? Plug and play?

[SilviaT]

Cutting out under boost after i cleaned n60 mafs
sr20det redtop rebuilt forged pistons, oem build. enthulapy tune pre mapped to n60 440cc injectors, headers full exhaust greddy rs bov recirculated internal wastegate t28 turbo.
SO i am missing the C clip to my n60 MAF and sometime when im driving ill notice my idle drop from 900 to about 600 and it will not rev past 2500/3000rpms like its in safe mode.. I get out, wiggle the connection to my MAF and it goes back to normal.. Drives great, pulls hard and idles steady until the connection gets messed up....
So everytime I would have to adjust the plug on the sensor, it would drive great after I made the connection solid.. So I let the car sit for a few days in the garage and thought about what I could do to fix it..
Cleaned my MAFS with MAFS cleaner.
Cleaned my filter with k&n cleaner kit.
Looked at the 4 wires going into the MAFS and made them all snug and tight in the plug.
Reset my ecu, now it's cutting out at boost!!!! Anything after 0psi under 3/4 throttle and it starts to cut out and studder/bog/ run like crap once its getting load....
WTF! It ran fine before, now it'd acting like its in limp mode and only getting code 55 on the ecu! It's an enthlapy tune btw. 440cc and n60 MAFS..

MY QUESTION ISSSSSS: since I believe my MAFS is damaged, if I were to upgrade to a z32 MAFS would it require additional tuning or could I just plug and play? I'm looking to make 300hp for daily driving and I just want this boost cut to go away.. I have access to a z32 but I'm hesitant of switching MAFS since I'm on a budget....