Tom,
Here ya' go. These 3 stamps are in order of seniority. The first being the "pre-fire" Tampa, the second being the transitional with the city X'd out and the third the current one used today.
I know there will be quite a few "exceptions" for some time. (Not unlike Randall sheaths, stamps, snaps, etc.) I personally would scoff-up all of the "x'd-out city stamped stuff you could get!!
Best, Capt. Chris