Nope. It was quite clear that he was making two separate arguments, and not stating that the broader general case directly implied that the more specific case necessarily followed from that. I really think that was made very clear indeed, which is why it's not fair to call that bait-and-switch. Given that this is my only position, I don't see how simply restating it can be classed as a "weasly defence" either.
If your position is that he accused you of denying that the more general case can even happen, when you said no such thing, then by all means call that a strawman and I'd probably agree. But remember that you didn't say "I never said that, that's a strawman", you said "that's a bait-and-switch" argument, and it's the latter which I was responding to. Ironically, one might claim that you are now making a bait-and-switch argument by trying to claim that the former is what you were talking about all along.