yep. manual adjustments exactly how you described. on my scope i know (roughly) how much focus extension i need, so i set the tube to ~20mm and then use fine focus to get it the best i can. ive got a bhatinov mask as well but usually forget it inside.
Can you explain how the focus aid works?
Are you using a remote focuser or manual?
If manual, do you move - wait, move - wait etc. and try and get the lowest number?