I think it would help to make shadow training first to get the right feeling of the needed footwork.
then in your practice, you may want sometimes not to focus on serve quality in priority but on recovery. Of course you want both but its difficult to focus on both at the same time.
also you...