yes to the first and no to the second...at least not without a rebuild. the shift points/valving modulation are different in the diesel.