Here's a method from your first file to keep an angular look and use fillets to smooth the edges. (I also fixed the lack of continuity in the blends first, like others)