I’d consider a water heater an inconvenience. Helping my sister escape from her literally homicidal husband and get another place to live was an emergency (and the SOB pleaded down to some BS misdemeanor!). I had two other emergencies of that level in the last fourteen months and I’ve rebuilt my Baby EF three times, but I still got all but the last plastic paid off, and it’s down to under a paycheck. Two more months, two more months, and I can start working on the long-term fund.
I was just using that example as an indication of a mindset. Yes, helping your sister is a major setback, but it sounds like you have overcome it and are keeping on track. Keep it up. Living like no one else is tough, but it is well worth it. It took me just under 3 years to get to baby steps 4, 5 and 6.