I would train fasted if you cannot give yourself a good hour to hour and a half to digest prior to the pre workout. This is what works for me and the pre workout tends to hit me better the more empty my stomach is.
I would consume amino acids with your pre workout. If training fasted sounds tough, maybe a higher stim option for those days will suit you well. HyperMax XT would fit that bill with 320 mg of caffeine and eria jarnesis extract which is a great mood enhancer and really helps increase focus. hat should definitely help until you get used to training fasted. You wouldn't need to worry about pumps with the ingredients in it as well.
If you're looking for a lower stim option, there are great choices out there, but I would then suggest supplementing with PowerMax XT. You would get your full dose of creatine, tmg to help with performance and body compostion, amento to aid in workout performance and finally taurine and glycerol to aid in a pump which some find difficult fasted.