If I may offer one suggestion: Unless you really need pull-up
(pitch raising) capability on the whammy bar, you can set the
tailpiece down tightly against the body by adjusting the spring
claw. I set the springs securely, tight enough to prevent forward
bridge movement while string bending, but in a fashion that will
allow easy pitch drop with the bar. (You don't want it to bend
or break the fragile bar.) There is a great increase in acoustic
vibration and note sustain on a strat with just this easy tweek.
It's a really simple thing, but those who don't know about it are
amazed at the improvement when shown. Works on any
tremelo strat, even helps the american standard's streamlined
tone. As a bonus, the guitar stays in tune much better.

 I read somewhere that, although Leo's patent drawing shows
the tailpiece set in a balanced, above the body position, early
strats were shipped with five springs and the tailpiece adjusted
down solidly against the body. It wasn't until late '50s (surf
music craze) that they were delivered set in a balanced position.

 My guess is that the vintage style tremelo bridge assemblies
supplied with Fender MIJ strats are japanese made, and most
likely by Gotoh anyway. The one from AllParts or from
StewMac for instance should be a direct replacement. One tip:
Measure the distance from #1 to #6 mounting screw on your
guitar. Also, measure the spacing between your outer E-strings
at the string intonation point on the bridge saddles. Do the same
on the new (prospective) bridge assebly. As long as the six
mounting screw holes fall into place there won't be any work to
installing it. If the string spacing is same or near the same, your
strings will fall along the same lines on the fingerboard they do
now. The only critical thing is if a string lies too close or too far
away from the edge. In the first case, the string will keep falling
off the edge on mild bends. The second case, strings too far
inward, it may bother certain players with shorter fingers (that's
me!). I prefer the vintage setup more than the AmStd or
MexStd guitars. YMMV.