I just leave the choke tube in the barrel when I clean the barrel. That way, the choke is always clean. And I don't clean the choke lube off the threads.
If I use more than one choke on an outing, I'll clean the barrel with one, then swap chokes, then clean the other tube in the barrel.