Yes the '00+ solenoid will probably be your best bet. The '00+ kit is the one I installed, and only one solenoid in the small pan had a different body as the one it was replacing, but I was told from a tranny dude that it should be ok. I went ahead and got that one solenoid from the old kit, but looks like I am now having problems with that solenoid so I would just put in the newer kit.