Is there a way to get pico8 language support AND support for included files within VS Code?

I'm using the pico8-ls extension, which is great, but it doesn't recognise #include files, so I miss out on code completion on functions imported by my .p8 file. If I switch and use the lua language server extension: https://marketplace.visualstudio.com/items?itemName=sumneko.lua I get code recognition of my functions, but not the p8 functions (weirdly the lua language server seems to assume files are included even if they are not, or at least it seems to me it does). I'd ideally like both p8 function recognition from the pico8-ls AND recognition of my included functions. But this doesn't seem possible as of today.

I did note that support for #include files is a planned featured of the pico8-ls function so maybe I just have to wait for that