All is working now.
My configs appeared to be ok from the GUI interface so I tested all required vlans individually on a separate switch port. As soon as I added my data vlan to another port, the wifi connection on my laptop started working properly. Simply adding the correct vlans via the CLI was not enough, I had to do it via the GUI interface.
I will be testing a few more options before putting the switch in operation but for now all is good.
Thanks to those who responded.