These bad boys are getting to the limit of the lifespan of many of the OEM components. You should consider just replacing the clutch master cylinder. I just did mine at 220K miles and my symptoms were almost identical to yours. Along with a trans fluid change to Redline MTL, Its good to go now.
91 YJ Sahara, 4.0L, AX-15/NP231, D30/D35@3.07
12 Cherokee 4x4,3.7L,42RLE/MP1522, D30Memail@example.com
"Non Vi Sed, Arte"