Just did this job on mine this afternoon. It went much more smoothly than I had anticipated.
I went with the TRW JTC1316 (987 part) as they were a little cheaper at the time on Amazon compared to the JTC1186 (now they're opposite).
The wobble extensions were a good call, Steve. Did it one side at a time and got it all torqued nicely. And no more rattles!