Let it set for awhile,reads like you are chasing a herd of kittens,Going to many directions ,gets nothing accomplished,,Just let it set and come back to it later,fresh mind and work on it then. Breath deep and go for a walk,read a book,,
I like what you have done sofar,but IMHO your getting close to over worked,IMMHO.