i would look at a factory efi pump, and add a "can" type of thing around the fuel line pickup point that would capture a certain amount of fuel to make sure there would not be a problem with starvation.
as to the baffle holes, i would select a size, then use dimple dies on the holes. maybe switching the die every other hole. in my [feeble] mind's thinking, this may slow the back and forth sloshing quite a bit.