How old is the battery? Are you sure it doesn't have a bad cell? As for the starter, try wacking the motor portion a few times with a hammer. If it starts after that, I'd say it's the starter. Sometimes hitting the starter motor with a hammer frees up the brushes from the armature. Just because the solenoid is clicking doesn't mean the starter is OK.