idle and hesitation

[240sxproblems]

I am having a problem with both idle and hestiation. When the car is idling it will idle at about 1500rpm and the gradually creap up to about 2300rpm then it will go down to about 700rpm. Also when I decelerate the car will die. I am also having a hesitation problem right before I go into boost and when I start to spool up. I was thinking that it might be the maf but I am not totally sure. I have swapped out the o2 sensor, the acc valve and i have tried to clean the maf. My set up is a t3/ t04e with z32 maf 370 injectors and safc. The computer has not throw any codes.