Either on of those will do fine. The first one is the factory cam used in the original engines so you can't really go wrong with that one. The Comp cam will work fine, no need to replace the valve train, but it might require cutting down the valve guides. I'd go with the first cam you listed...