Yep, it should improve with time. I've experienced all the symptoms you describe. Melatonin has worked for me, you might look into that.

Just curious, why does your cycle contain two different long-acting esters of Test (Cypionate and Enanthate)?