Try https://www.pgcli.com/install if you haven't already, it's a nice improvement over pure psql.