You can try Armodafinil instead of modafinil, it cause less anxiety. Also not popular but apparently effective, amantadine is an interesting dopaminergic.