Just wanted to update, the starter finaly completely died, and as a requirement to have a working car for work the next day, I just got a new starter and droped it in.
However, I do plan on going ahead and doing the Bosch Relay, as it is easy, and I mite as well go ahead and get it done now before I have problems with that