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.