Touchpad not working correctly after kernel upgrade

Since the kernel upgraded from 4.4.0-31-generic the touchpad on my Toshiba Tecra laptop has not been functioning correctly.

Whenever I try and do two finger srcolling it also thinks I'm doing a two finger tap to to rightclick, making two finger scrolling almost impossible.

It is the same for both kernel updates since 4.4.0-31. If I boot from 4.4.0-31 then the touchpad works fine.

If I do an xinput in the later kernels it shows :-
⎡ Virtual core pointer id=2 [master pointer (3)]
⎜ ↳ Virtual core XTEST pointer id=4 [slave pointer (2)]
⎜ ↳ Microsoft Wired Keyboard 600 id=10 [slave pointer (2)]
⎜ ↳ Microsoft Comfort Mouse 6000 id=11 [slave pointer (2)]
⎜ ↳ AlpsPS/2 ALPS DualPoint Stick id=15 [slave pointer (2)]
⎜ ↳ AlpsPS/2 ALPS DualPoint TouchPad id=14 [slave pointer (2)]
⎣ Virtual core keyboard id=3 [master keyboard (2)]
    ↳ Virtual core XTEST keyboard id=5 [slave keyboard (3)]
    ↳ Power Button id=6 [slave keyboard (3)]
    ↳ Video Bus id=7 [slave keyboard (3)]
    ↳ Power Button id=8 [slave keyboard (3)]
    ↳ Microsoft Wired Keyboard 600 id=9 [slave keyboard (3)]
    ↳ TOSHIBA Web Camera - FHD id=12 [slave keyboard (3)]
    ↳ AT Translated Set 2 keyboard id=13 [slave keyboard (3)]
    ↳ Toshiba input device

The AlpsPS/2 devices aren't aren't present when booting with 4.4.0.31:

⎡ Virtual core pointer id=2 [master pointer (3)]
⎜ ↳ Virtual core XTEST pointer id=4 [slave pointer (2)]
⎜ ↳ Microsoft Wired Keyboard 600 id=10 [slave pointer (2)]
⎜ ↳ Microsoft Comfort Mouse 6000 id=11 [slave pointer (2)]
⎜ ↳ ImPS/2 Generic Wheel Mouse id=14 [slave pointer (2)]
⎣ Virtual core keyboard id=3 [master keyboard (2)]
    ↳ Virtual core XTEST keyboard id=5 [slave keyboard (3)]
    ↳ Power Button id=6 [slave keyboard (3)]
    ↳ Video Bus id=7 [slave keyboard (3)]
    ↳ Power Button id=8 [slave keyboard (3)]
    ↳ Microsoft Wired Keyboard 600 id=9 [slave keyboard (3)]
    ↳ TOSHIBA Web Camera - FHD id=12 [slave keyboard (3)]
    ↳ AT Translated Set 2 keyboard id=13 [slave keyboard (3)]
    ↳ Toshiba input device id=15 [slave keyboard (3)]

Any ideas?

Thanks.