Hiya
Structure seems fine.
Only comment is that the potential "rainy day" fund prob should be set up as a separate loan split just in case you do end up using it for a non deductible "rainy day" purpose.
I'd also park the equity release back into the loan account to redraw for your IP later -...
