I did the same, glad I did

 

one more thing you can do is "trick" the engine by turning the wheel 1/4 right an 1/4 left a few times @ the stop when idle lowers down. The PS pressure sensor makes the idle go back to normal, Ive replaced the ps sensor too that didn't fix idle I just have a tiny leak somewhere I have never been able to find, even with all new vac rubber lines that helped some but not much

 

I have the same issue at a stop light. The rpm drops down to like 500-600 rpm and the oil pressure light comes on. Moving the steering wheel does not increase the rpm like you said.

 

if the rpm don't change that power steering pressure switch is also not working.