I would stay with your 2004r, if you want to keep overdrive. It is more evenly geared and you dont have to modify anything.