I would not say you have a weak point. 11%. 8%. You are over critical of yourself. You have more rigor than pretty much anyone. Too much in fact.
Assuming you are 100% ok with your safeties and RPI your list is fine. A safety has to be affordable and you’d be happy.
As long as you have two and you do, anything else is up to you. If you are NMF finalist, look at Alabama…free tuition and four years housing.
Not sure RPI fits…why RPI?
UNC a reach as previously stated. If UNC how about u of Washington which is strong in the major. CWRU may be a slight reach. Florida and Indiana are two more solid publics in the major.
You may look at W&L (Johnson Scholar) but honestly I think your list is fine as is.
Good luck.
Ps you don’t list budget. You just say will be full pay. ED can be a huge boost but ensure you understand your finances, even if full pay…does your family want to pay? Some schools will be $340-360k over four years. So be careful with ED. Make sure your parents are ok when you’ll have other schools, such as Baylor and A&M, that will be much less or if you get NMF you can go really cheap. Many do it but it’s not for everyone. And of course many regret it when they realize they’re family doesn’t support full pay even if they can pay, like yours. etc.