If the only 'new' part is the 3.0 block why are you bothered, fit the 2.5 cams & chains etc as they were when you removed them from the 2.5,as you checked the marks when you stripped it rebuild it to the 3.0 block the same...