I also vote for the stock cam, a cam swap is a decent amount of work for the gain you'd get with the stock heads and intake. Think about it, when you go do a cam your looking at possibly replacing your cracked fan if you still have the stock clutch fan, you might as well do a new water pump...