Get a strong front light, and strobe it whenever you ride. That'll dramatically cut down aggression from oncoming traffic.
The strobing front light may help, but I don't think either of those two acts were intentional aggression toward the OP for being a cyclist. I've encountered identical manouvers on my commute, and I'm pretty sure it's just idiocy. The same drivers would pull the same stunts if the oncoming traffic were automotive and not a bicycle.