I found a small error in the geometry hammer. I redirected some geometry at the corners of the x shape and forgot to reconnect some edges.

Sorry for the error. I normally do a thorough geometry check before I post stuff but I was in a rush.

Look at the corners of the X shape there needs to be 4 edges going corner to corner to eliminate the 4 non-planer n-gons. This will have the added benefit of adding more geometry across the top and bottom which will smooth out some of the distortion at the top and bottom edges.

Also, you may want to separate the top face as that shape is really odd and trying to unify the top and side without distortion near the top is really hard, it was for me.

I have a layout that is pretty clean now but unfortunately I cannot post it.