Those sound like good goals - and honestly cut yourself some slack over how hard you're going! Some progress is better than no progress at all - and imo it's better to have a smaller sustainable step than something larger that you can't maintain longer term.