Oil light on at idle when warm.

Oh hogwash. Stick with the original plan. Idle it up and run thicker oil. And if you think you hear a noise, turn the radio up. Why in the world would you want to diagnose anything and fix it right? That makes no sense at all.