Seems to me that if you have a problem with your current motor, instead o putting in a 302, how about a mercedes motor? Either a gas motor or a large diesel. As you already have the fuel system in place, it would be easiest to go diesel to diesel.