@GameDadGrantYou've always been a wise one. Good plan to play the original again before the new one releases as it seems the new one is really going to be expanding on everything.
My records show I beat this Dec 2015 (original release on 3DS), again in Oct 2016 on Wii U, then again on 3DS in Nov 2018, and then the last time I beat it was Apr 2022 on Switch. So it appears I've triple dipped and just hearing you going back in has me wondering if I should get a fifth playthrough in there before August...