Ok I'll have bit of fun here. OP is in a great position. I'd approach it a bit differently. This will be fairly set and forget.
Pay off your unit. Establish trust structure and redraw / loan equity to trust. All your new investments will be in trust. Don't worry about cash buffer until your...