Right on, man. If you're gonna do the top end, go ahead and toss a new cam in it, even if it's stock. Not that much more money or time since you stripped the front end. And it'll take that possibility out of the equation.
Alright... I gotta go wire up the relay for my new lincoln fan...