Might check with Terry to see if 2.5 heads will fit on the '01 blocks. Could save some coin going that route. I know the water pump issue was the reason behind the pre-01 heads not fitting, but I'm side stepping that with an elctric pump and cutting the cams.
Rick