Installed new starter. I still have to put my engine back together (I removed the intake ductwork and DISA valve to make room to work).
Also, in the end I disconnected both B+ and alternator cables so I could move the starter over fast enough to reach the nuts on the end of the solinoid.
Here is a pic showing how I got to the nuts using a long extension and a swivel.
There is a ton of space next to the starter, but it's cut in half by the dipstick tube. Turned out to be about 10x as easy once I removed the tube!