When is my next 90-day report due after re-entering Thailand with a Non-OX visa?

90 day report question

I am on a Non-OX visa. I arrived in BKK on 15 July 2023, did my TM30 straight away and then my first 90 day report on 16 October.

On my TM43 receipt notification, there is a stamp stating « notify your address again on 15 January 2024 ». I assume this refers to when my next 90 day report is due.

Now, I departed Thailand on 23 October and will re-enter the country on 11 January. I will stay at a different address than the one indicated on my first TM30 and will therefore ask the landlord to do a TM30.

If I understand the immigration requirements correctly, I should be doing my next TM43, 90 days after the date I re-enter the country, ie. on the 9 April or thereabout.

Question : this may sounds ridiculously cautious, but in order to play it safe and given that on my current 90 day report receipt the indicated due date is 15 January, should I trek to Chang Wattana on that date and do it then ? Or should I ignore the date indicated on this receipt and do my next TM47 90 days after my re-entry date ?