Yes, y not. What you stated above is correct.
As one’s understanding of the Four Noble Truths and Tilakkhana grows, one’s punna kamma will automatically become kusala kamma. So, one should just keep doing punna/kusala kamma and not worry so much about which category they actually belong to.
