An angled-deck Essex in either of those scales does not exist at this time. However, there have been some persistent rumors of one forthcoming sometime in the next year, most likely from Dragon.
The Revell box-scale Yorktown is actually fairly good for the age of the kit. It needs some TLC to help bring it up to current stanards