Yup, the AFV Club kit would be the way to go. With the AM parts added to the Tamiya kit, it'd be about the same price with less hassle.
I think I may have said exactly the opposite last time, but that's how I feel now!
I built the Tamiya kit with the Ordnance Models PE and resins sets, and you do get a nice Bulldog, but with the AFV Club kit, it's all right there in the box.