You are correct about all of your assumptions. When face cards are drawn as churn you use their churn. They are not removed from the deck unless you defeat them as a threat. For the core queen if drawn as a location you would draw for a churn and threat as normal.