I have similar setup. One improvement that I really liked (for those few times where I don't use the usual map) is that rofi have alt+tab search in window titles which helps massively to find any temporary app or terminal I might've run somewhere.