I may be mistaken, but if the starter is "whirring", that sounds more like the bendix drive is bad. Can the bendix be removed easily on your starter without the removing the whole starter/bendix assembly?