Thanks for the feedback guys, I've been traveling for work over the past couple of months so I haven't had a ton of time to be in the garage. I'm about to dive back into it though.

Where I got to so far was swapping dropping the pan and swapping the fluid. Shifts were smooth and it drove for about 1/2 mile without and issue but the lights jumped back on. I pulled the pan again and checked solenoids Sl1 and SL2 both of which seemed to operate normally with batt voltage.

With the pan dropped and the key in the "on" position (no turn over of course) the lock-out solenoid was humming and operation looked slightly clunky so I'm thinking this might be an issue, are solenoids suppose to make a humming sound?