You may want to add schools that don’t consider SAT subject tests at all since that’s the weak link. The rest of your stats are very, very solid. In general the top schools want to see the whole package so I don’t think your ECs can make up for a weakness elsewhere. You may want to dig through the common data sets for the schools on your lists to see which don’t weight the subject tests as highly. That might help you better decide to ED somewhere.