Yup get a Linux native machine

I haven't done partitioning in around a year so really can't remember how I had changed the structure but I think simply using gparted should be enough. Although you may want to follow the instructions you got from your search as mine is a very sketchy re-collection of my own experience.

Lastly, best is to have a back up in case anything goes wrong