Hard Downshifts

[purdy007]

My beetle is starting to grab when downshifting from 4-3 and sometimes from 5-4. This does not happen all the time but enough to bother me. Obviously, I am concerned that this is going to become a real problem (given time). I have read many posts on this topic. And, I have a feeling that I will need to replace the valve body on my Beetle. However, I was interested in changing the tranny fluid first. So, I looked on blauparts.com for a fluid kit. But, could not find one to match my car. So, I emailed them and apparently they do not carry a kit for my model. I have a 2003 Beetle Automatic 6 spd Tiptronic (Convertible) 2.0L Gas Engine. Does any have a recommendation where I can purchase a kit for this thing (other than the dealer)?

[purdy007]

Had a new problem arise today....curious if it might be related to the downshifting. Had a huge wet snowfall. Battery light started flickering. Dash guages dimmed. Car seemed to run OK (other then the downshifting problem). The flickering battery light continued to happen randomly for about 15 minutes. Opened hood and quickly checked battery connections....looks good and solid. Had the car in underground parking and dried over several hours. Turned car on and battery light is now off. Could these two problems be related?

And, one more thing (how could I forget). O2 sensor went couple of days ago (had mechanic scan for code) and told me the CEL was from a bad O2. Have not yet replaced as I am trying to figure out what I can afford to do here.

Any advice would be appreciated!