Thanks everyone for the advice, took it to the alignment place today and it turned out to be a combination of things.
The drivers side front wheel was a but out of balance, and when he rebalanced it the wheel wasn't as round as it should be which is disappointing. There is also a little bit of play in the ball joints but nothing too serious the guy said.
We put the dodgy wheel on the passenger side so it wouldn't cause as many vibrations, the drive home was alot smoother, but that news about the wheel is a bit disappointing.