I am not entirely sure, but I think EY does have some form of an EY Stopover for J and F. Additionally, for an increase from 4 to 11 hours, especially in a situation where they messed up your reservation by cancelling a flight, they should cover something like that. You can try posting in the EY Lurker/Etihad Help thread