600 cubes and a large drop assume its NA. IMO 1000rpm is alot on the shift, certainly leaving ET on the table. I know nothing about EFI other than OE applications but I would check vacuum. But like to see the converter be a bit closer too.
"I am not ashamed to confess I am ignorant of what I do not know."