Cool, yeah you are, kinda.
It turns out the core in the baja's radiator is apparently partially clogged. I pulled it today and gave it a quick rinse. I filled it all the way up with water and let it all drain out. It displayed tell tale signs of a clog. I've seen it before where after you thought all the water was out, you tilt it and some greenish liquid comes out (diluted coolant). You wait a little longer, tilt it and some more greenish liquid. I'll go with a 1st gen rad and mod it where necessary. At least if it gets damaged, I can replace it easily enough. Gotta get creative for how to mounts the fans, though. The core is smaller, leaving less room.
I gotta say I'm feeling relieved that I'm going with a 1st gen rad. I'll mod it in a similar way to the rad in the GLC.