your point about pre-op is so important, since not everyone wants bottom surgery, but I am a trans woman who uses the term "pre-op" a lot, but mostly to refer to before my surgery; when talking about other trans women I might use the clunky "pre- or non-op" as a more inclusive phrase to indicate what OP originally meant by just "pre-op" (though it would only be in niche contexts, like if talking about getting through airport security or how to tuck, etc.)
On the flip side, a lot of people just assume trans women are pre- or non-op, almost to the point where it feels like "trans" just communicates "has a penis" to a lot of people, and that can be similarly frustrating for various reasons.