Use ZMA at night to sleep deeper and better. Also stay on a consistant schedule for a while so your body gets used to it.
Nothing wrong with naps. I take a 1-2 hour one each evening before the gym. Set an alarm too! But if you are going to nap, do it everyday or never - again, to keep a routine.