Paint and steering issues

I've got a couple of questions for the pros on this forum. I have been experiencing a steering issue with my 2007 4wd tacoma. The power steering seems to be fine on the first rotation of the steering wheel but gets very hard right before lock. It does it rotating both ways.

I checked the steering column universal joint and it moves back and forth freely (also sprayed it with penetrant). I also replaced the upper half of the column with the round rubber piece because there was too much play in it. I am wondering if the issue can be the power steering pump. It doesn't make any noise typical of a failing pump. Has anyone experienced this?

My second question is, does anyone have an idea on how to repair minor surface rust all around the windshield up against the rubber? I had my windshield replaced a few years ago and I think they damaged the paint with the metal wire they used. Is it possible to install the rubber on the windshield without removing it? I was considering removing the old seal to paint the edge and installing a new one.