Neither, I took it out and got it tested. Both solenoid and starter are fine.
And it started fine today. I drove it all around, I went to the gas station though, and it didn't start again. I flipped! It's pretty random I guess.
I depress tha clutch, turn tha key, one click is all I get...