Choose the 8-pin 12V connector for your MB. The 4-pin version is not compatible.
Your setup is correct. You only need the 8-pin ATX12V1 power connector, and the 4-pin ATX12V2 is not required.