It looks like you’re in great shape. However, I would still question the replacement of chemistry with AP Environmental. Be sure you look carefully at the websites of all the colleges on your list, because some might be expecting to see chemistry - this might be a good question for the college admissions forum. (And since it’s a bit early to have a list, take a look around at the websites of a number of possibilities, like your state flagship)