Why not take AP physics1 Jr year, then AP physics C senior year?
Same idea: why not explore the hole field of CS junior year (csp) and then take CS A senior year?
APUSH is a definite"rigor marker" for college admissions but it’s not mandatory since you have other “markers”. It IS quite a high step or two above regular ush.