OP, if I was in your shoes, this is what I would do.
Seeing that it's a street car ONLY, leave the engine in, put 6-6.5 litres in the sump and drive it (middle of the hump). I don't believe it's cost effective to pull the engine, sump off, pump, baffles then put it back in. You've just done a half assed job. If you're going that far you may aswell spend the little extra and give it a freshen up (IE Ring's and bearings. While you're there pistons and rods... Very easily get out of hand). We are now talking about a rebuild.
If and when the time comes, then do all the above.