You do not want to match the heads to the circular primary on headers.

You want the retain the factory "D" shape style port. Over porting will net you no gains