1987 Chevy Truck Spark Knock

My 1987 V20 pickup with a 5.7 TBI engine has around 10,000 miles on a new long block. At part throttle under load it pings and smokes. I have replaced the O2 sensor, MAP sensor and have checked the EGR valve. The EGR valve works properly. I check the Vacum selenoid for the EGR valve and there seems to be no vacum there, but this may be due too not being fully up to temp. Would the knock sensor be the most likely culpret for this. It did have a 13 code, that is why I replaced the O2 swensor and it also indicates the MAP sensor. Really need some help here, thanks.