940 rebuild... should I?

Yep, just by dropping the valve body and putting it back in, because that part goes on the top side of the VB.
I think I may have actually giggled a little when I drove mine after.:D

I'd actually probably laugh out loud if I could pull that off with mine. I've watched a few videos and it seems like the hardest part of pulling the valve body is getting the parking rod in and out. Any tips for that?