Any good alternator/starter rebuild place should be able to refurbish the old one and make it better than any off the shelf unit would be. Might be a little more costly, but in the long run well worth the added cost.
yeah, you may need to get something in to hold you over temporarily, but i would have the stock one rebuilt and put it back in when done.
did this with my old 95 Legacy and it was so worth it. Still have the aftermarket one up on a shelf, lol
This is the kind of place you want to find.. https://www.generatorstartershop.com/