You’re doing the basics. Having a 6 months slush fund is also good. Can’t always prepare for catastrophic events better to just be thankful when you got it good.