Window Motor Queation

I think that my driver side window motor is going out.I can hear the relay click.
But sometimes the window just will not go down,sometimes just hitting the door will work.I know it could be a connection issue but I will take it apart and look.

My question,is it easier to just replace the motor or the motor and arms that are attached to the motor since I can buy them either way? Also is the motor itself using rivets or just the arms?
Also Im sure I will need to re-rivet the window back in,what is the best way to get the tool for this.

Yeah I bought that one before for my 01 GT and on the 2nd rivet the housing that holds the rivets cracked into 3 or 4 pieces.
Im not sure whats going on with that window,last night I removed the door panel and tapped the motor with a rubber mallet once or twice and now its working again.
?????????

Thx for the reply.