If I may be bold to suggest it's no longer prudent to think in terms of retiring in x number of years. IMO, the proper mindset is survival. Right now, no time to waste.
I have been in that mode for the past 2 years.