Ahhh... Simple solution. Delete the edges in red (in the blow-up), and change the topology to that in the blow-up. That should keep your mesh all nice and quad, as well as get rid of that nasty pinch.