Both the new Trumpeter Yorktown and Enterprise kits are based on the Merit 1/350 kits, so they are not related to Trumpeter's Hornet kit at all, and therefore have better bow shapes. Both kits are waterline only, however...no full hull option.
The Academy Enterprise kit has a full hull option, as well as waterline. It depicts the ship in Midway fit. The Trumpeter Enterprise depicts the ship in Santa Cruz fit...a difference mainly of updated AA guns from 1.1 inch to 40 mm mounts. Trumpeter's Yorktown is--of course--Midway fit.
Any one of these 3 should give you a nice OOB build without major surgery. For the Trumpeter Enterprise, you will need aftermarket torpedo bombers, however, since the older TBD were included in the kit in error, instead of the TBF she carried at Santa Cruz. That is a comparatively minor thing next to Hornet bow surgery, and new lower hulls, and so forth.
As mentioned below, the old Tamiya is a fair Hornet kit. Under scale, yes. Also not the latest, most detailed, etc. But, if OOB/no fuss is the main consideration, you get a Hornet out of the Tamiya kit at the end of the day.
Hope this answered the question.