Yeah, I'm pretty sure that's the one. I just went to the local auto parts store and asked for a 92 Camaro heatercore (a lot cheaper there anyway, almost half the price

). The metal tubing was hell to deal with though, I even bent some of the heatercore's fins

.
Those were poly barbs (all I could find, 1/2"x1/4" NPT barbs are hard to find

), so I couldn't solder them. I just sawed off the metal tubing as close to the tank as I could safely, and used JB Weld to keep them in place. The nice thing was that they fit in pretty tight already, so all it really took was a little bit of screwing and JB Weld to seal it (and to secure it on

). I tried JB Kwik on another heatercore, and I don't know if it was user error or what, but it didn't hold all that well (leaks galore ;[ ). If you didn't know, you can get JB Weld at a hardware or auto parts store.
One more thing, the heatercore in there is pretty tight fit, so you might have to sorta smash it in there

.