@goatpig  Thanks for your very clear explanation.  I think I am close to having a working fork of Jimmy Song's tool (https://github.com/jimmysong/hardforkhelp) for forks that works with P2SH.   I'll post a link here when I have tested it a bit more.