I think you're doing the right thing. The first step towards financial independence is building a reasonable emergency fund. The peace of mind is liberating.