In the end, even though I own a PS4 I just went and purchased the Bluetooth X1 controller, and battery pack, and its about as good a controller as I could possibly want.
I looked at the X1 but decided against it due to the lack of motion sensors. Steam natively supports PS4 pads already so took the jump. I guess I'll find out if that was a good decision or not tonight as it's been delivered today!
