Add U Rochester to your list. Your stats make you competitive and they can be very good with need-based aid. They are a private research U in Rochester, NY (if you hadn’t heard of them). I believe their latest ranking is in the 30s with USN if that matters to you. It’s a very worthwhile school to consider. My middle son is a senior there.
Pitt stinks with need-based aid and your stats aren’t high enough for merit aid. You might want to drop them.