940 rebuild... should I?

Should be lower? like 15 and 35?

Stock was more like 10 and 15 under light throttle, but they shift like crap for a street car like that.
The problem is that once the pressure is thrown off by upping the shift points, the pressure is too high to kick down.
The Transgo TF2 shift kit solves a lot of that and is the mid range of the kits.