E36 starter woes

Hi fanatics. As the subject states, I'm having some stater issues.. I drive a 95 E36 325i (M50B25 motor) I recently started having starter probs. Sometimes she swings cleanly. Other times I hear the solenoid/abendix click once and then nothing. Some times the starter motor swings freely but no kick from the abendix. After a few times trying to swing the I'll get her started but she gives a "lazy" swing with this procedure. I've replaced the solenoid already and given the motor a good clean out. The brushes are in fair condition and the starter armature checks out fine. Is there perhaps any relays or something that could be faulty? Do u guys suspect wiring? I haven't had the battery checked yet but that's only a year old now. Any advice would be appreciated.

Thanks in advance

*I love my E36!*