As surveys have shown that etymological information is the least often sought after, making the average user wade through the etymology before getting to the definition has always seemed pointless and irritating to me; besides, it is unlikely that the serious, consistent seeker of etymological information is likely to use anything but the OED or a major etymological dictionary.
I think it makes more sense to list the definition before the etymology.