Finally got the Fuel Pressure Regulator (the one on the back of the fuel rail) replaced. Idle has gone from 1800-2000 RPM to 1200 RMP and around 980 RPM when in gear, but not moving. Removing the throttle body now for a cleaning and new gasket.