Can't really say about the oil thing, but your coolant capacity for any motor should be determined by how much you can fit in the radiator after burping the car, correct?
On my Mk2, used a tool of some sort (can't remember the name at the moment) that connected to the top of the radiator and sucked all the air out of the system, then used that vacuum that was created to pull coolant from a clean bucket into the system. Completely full of coolant, NO bubbles.
Hope that helps at least some...