2001 F-250 5.8L V8, 16x,xxx miles:

Tying to leave work a couple nights ago, I could hear clicking (either solenoid or starter moving but not engaging/turning, but it wouldn't crank). I started to walk back in, return to the truck to give it one more try, and it started.

There have been no recurrences since but I'm paranoid about being stranded anywhere.

Is replacing the starter & solenoid a safe bet or should I be looking at anything else?

What will this cause at dealer vs. independent shop?

The starter was previous replaced under warranty at 3x,xxx miles.

I also plan to replace the battery (5.5 yrs. into 6 yr. warrant).

 

I would replace the battery first, with a basic set of tools you can change it yourself. Dealer would slam you about 350.00 -400.00 to do this plus parts! Most small shops will for 125+ parts. Now a days batteries don't last usually more than 4 years. You can also have a local shop test it as well.