Baffling will stop the problem, but would also be best to go big wing for extra capacity.
The yb sumps don't hold a lot to start with and the oil has a lot of work to do cooling the engine, a oil to air cooler would be wise as well.
tabetha