You are free to use whatever procedure you are comfortable with.
- actually no! One is required to use your operator's procedures unless you consider them dangerous.
I'm not convinced that the Thai event was due to the c/t pumps, incidentally, due to the pump location. I believe the trigger for all this fuss was the TWA 747 'explosion'? (and
there is an opening for the conspiracy theorists).
The simple answer is the auto shut-off and MC mod. Cheap and cheerful. Job done.
As an aside, it was good that Boeing changed the pick-up points for the c/t pumps with the NG so you do not get the Jurassic/Classic built-in climb imbalance.