Just curious, what is the reason for moving away from the Edelbrock injection to the Holley?
In general, in tank pump is best, see what you have, and a pump swap to get what you need should be fairly easy if you have TBI tanks and hangers (and the rail mounted should be irrelevant and unnecessary).