I struggled with this, and it’s sort of counterpart 年内 (it came to me at roughly the same time anyway.) So firstly solidarity, but also I got some really good advice at the thread below. Some of the suggested mnemonics genuinely helped me remember these, and also helped where similar uses of the two kanji have come up elsewhere.