I was reading somewhere that 18-24 months expenses is a good buffer to have as an emergency fund in retirement. I guess that works out about the same as your buffer plus all the other piggy banks you're putting aside.
I make sure I never have cash and keep it slightly negative using zero percent cards to defer expenses for free for 12_21 mths plus a cash back bonus I just invest all and hedge as well as let inflation eat up my int rate I pay making it positive real terms. Debt against Inc producing prop can be great. Put 30% Apts pay no taxes as long as u keep re investing 30 to 40% the pals offset any sales making it shielded forever possibly