Yes, it took me 3 hours also (1 hour of work and 2 hours of frustration) - but Here is the info you need to cut this job to 1 hour.
1.) If working on jack stands - remove the RF tire - you will need the room to work.
2.) Use a 1/4" drive ratchet and 12mm socket to remove the main power lead from the solenoid. There is no way to get 2 hands in there to hold the rubber boot up and get a wrench on it. The socket can do both.
3.) Release the wiring harness clip from in front of the starter - this is necessary to move the harness out of the way.
4.) MOST IMPORTANT*** after the starter is loose and the wiring is disconnected, turn it so that the solenoid is ON TOP and carefully angle it down and remove BEHIND the front axle.
DO NOT (as I did) try and rotate the starter with the solenoid down - or you will waste 2 hours cursing at it... and still not get it out.
After you figure out the position, it really isn't that bad.
On Reassembly, the only real trick is to again use the 12MM socket & ratchet to put the nut on over the power lead... otherwise straightforward.
