Hi Bram,
Thanks for reaching out. I asked around about this and I think this should have been addressed for 5.6 - which you should be able to try using the preview version. The expected behavior right now is that the rename is tracked as a branch for the actual asset (while the redirector may be treated as an add or edit). This did involve some re-ordering in the functions you mentioned.
Let me know if you have any questions after trying out the flow or looking at the code for UE 5.6.
Thanks,
Aditya Ravi Chandran