So just for info, I fixed my issue by creating a dataview from the BAQ, and using this post from @cbrown (thank you Carol!) to help configure the combobox in the grid against the dataview.
I made the dataview for my combobox a child to the grid dataview, which sorted the filtering nicely.
It is definitely a bit of a learning curve!