Have you adjusted the "Idle Airflow", "Idle Airflow Parked", or "Throttle Cracker" tables? (everything less than 9.0 set equal to 9.0 for starters)

These have been helpful to some folks with idle problems.

As for the cell 22 positive fuel trims. You can increase the values in your main VE table (map>75 and rpm>3000 or so) to bring the fuel trims down. Positive 2% trims is not a bad thing. Anything from -4% to +2% is pretty good. If you have a wideband you could set your desired AFR under load instead of using fuel trims as a guide.

Good luck. Hope I mentioned something helpful.