RB25 Starter Solenoid

[Xit40]

I am in need of a new stater solenoid for my RB25 stater. It's beginning to randonly click sometimes when attempting to turn it over, and I would like to solve the problem before it decides to not work anymore at all. All the internals on the starter look good. Does anyone have a cross reference or know of a solenoid I can just swap out? I read somewhere that I could possibly swap one out from a stock 240sx but I don't know about that. I just want the parts I need before I pop the starter out so i can just replace the solenoid and put it back together.

[driftersilvia240sx]

i took my stater to a local rebuild shop here in Bay City MI and rebuilt the entire starter for under 80$
Im sure you can someone in NY to do the same