Update: I threw in a Gates 16 PSI rad cap on the Westerbeke heat exchanger and ran the engine for ten minutes at dock. No unusual heating up and no leaking. Cost to me: $9. Thanks, NAFTA!
(I'll still overhaul the heat exchanger before I leave. Being the third owner, I have no confidence the zincs were changed enough to last intact another five years.)