you said you have to whack the starter and have now replaced it. Have you got a turbo heatshield, mine didn't on my FRST and so would cook and jam the starter, so would need to whack it, if you aint got one it would be woth fitting one else it wont be long before your beating that starter again.
Matt