Sounds good to me. I would also say that any protected IP (e.g., patents) generated with tax money should be licensed to American citizens but not foreigners.
Foreign governments would of course be encouraged to do the same thing if they’re funding research.