940 rebuild... should I?

Oh yea, wouldn't think of it without the book, that's for sure. And I'll be sure to do my research on the rebuild kits. It might even make sense for me to pull it apart to investigate it first and then I'll know what should be replaced and it should help me pick out the right kit.
Again I recommend if you have a transmission Parts Warehouse or anything like that close by to get your kit there. If you have to go get replacement parts or anything it's a lot easier to be able to drive there. That could be a big if also because I just happen to live in a town that has two pretty comprehensive transmission warehouses.
And yeah that's mechanics 101 take it apart and have the parts match up at the parts store.