if there is click sound, there shouldnt b solenoid prob... im wondering is't the carbon brush inside the starter motor worn out adi... anyhow, if the parts inside the starter motor spoiled, i dun tink there wil b any1 willing 2 fix for u expect ask u 2 get a new/half-cut 1... add relay on ur starter motor n hv a try, if prob stil cant solve, say gd bye 2 ur current starter n get a replacement for it...
oh ya, better do those relay wiring at workshop den accs. shop, less chances 2 get chopped...