Okay, if I were you (and sometimes I wish I was someone else!) I would start from the beginning and start by creating a swap; root and home partiton using Gparted from the live CD!. In your case, you should also create a small UEFI partiton (512MB in size at the very beginning of your hard disk space!) for the UEFI bootlaoder!.
See the partition guide and READ THE PART ABOUT UEFI FIRST!: