Ok, after reading the full patch notes for 3.5 Trino version, here are my suggestions.
Disclaimer: I didn't actually play 3.5 and further on live, so correct me if I said anything wrong. My personal input is according to what I've seen from videos/posts/people talking and the patch notes, not...