It seems like Yale is the natural choice for you. Both schools are target schools for Wall Street recruiters and big tech firms, and the culture at Yale is more artsy and less geeky. At both places, the level of academic rigor is more dependent on the courses you take than the actual department rankings itself. A freshman at Yale who chooses to start freshman year with grad level math courses will obviously go deeper into math/CS than a freshman at MIT who simply follows the standard sequence, for instance.
Lastly, I wouldn’t really dismiss Yale STEM. It’s certainly highly reputed and in the top-10 for Math, Psychology, Biology, Medicine, Physics (especially space science), and top-15 for chemistry. The engineering departments tend to be lower ranked due to the their smaller size. If department rankings actually signaled the rigor of undergraduate offerings, schools like Dartmouth, Harvey Mudd or Amherst wouldn’t be so popular.