Yes, it will bolt up no problem, as you hint at, the bolt on stuff is different, but the basic engine is the same, at least on the outside. A minor note, make sure you get the right pilot bearing for the end of the crankshaft, there are two different ones. I wouldn't mention it to the smog people, in California at least it could possibly be a problem. Don't cut corners and not change everything since stuff like the EGR fitting on the intake manifold could trip you up.