Yes. Exactly right!
Tanha and avijja arise together. That is why four of the eight entities in a suddhatthaka are from avijja, and the other four are from tanha.
“The Origin of Matter – Suddhāṭṭhaka”
– That is also why both “mohakkhayo Nibbanam” and “tanhakkhayo Nibbanam” describe Nibbana. As we know, avijja is a reduced version of moha.
I have revised the post in question to make your points easily seen with a chart:
“Key Steps of Kammic Energy Accumulation“