How bout making it a 2 stroke penalty and drop at point of entry. It could speed things up by not having to go back to the tee.