Cheers for that woz! That link you provided will be a great help, I didn't even know it was possible to test the solenoids that way. I'm going to try and get a used zf6 hopefully this week as it seems a bit tricky to get just a torque converter as no one wants to part it from the box which is understandable.
I'm pretty sure I can just chuck my old TCM in the new one and reset the learning tables in FORscan and it should hopefully all work. Going uphill the other day I did get some gentle shuddering so I'm leaning towards torque converter.
At least when I go to swap the TCM I can test the solenoids with a multimeter then. I was quoted around $1500 in parts for the sonnax zip kit, new solenoids and a few other goodies but hopefully the valve body is still half alright as I don't really want to spend too much more on this car.
Thanks again for the advice and link, I'll definitely keep y'all updated on how it goes