I may have misunderstood, if you're installing the engine that came with the aluminum pan, then yeah you're good to go as far as the pickup. I don't know how the mount/cradle setup is on the '04 w/steel pan so I have no idea what you'll need as far as that goes. If you do need the other style bracket, the part number is in the thread I linked, $13 or so at the dealer. You'll know pretty quick if you try putting your old bracket on the new engine which one you need.