Did a little more work on the starter tonight.  I was able to get the small e-torx bolts out that fasten the solenoid to the starter housing, had to cut the head off of one and pound two around with a hammer and punch to do it.  I'll be replacing them with stainless socket head cap screws to allow for easier access with an allen key.

The result:

I plan on prepping the stator can, end cap, solenoid heat shield, solenoid, and starter housing for paint, probably some type of silver / wrinkle black combo.  The internals will be just be cleaned up and will be repacked with fresh grease.