That seems manageable, and having to make a deal to get his original form back is a good compromise! I can have the sheep npcs give him a task (like making Law play 20 questions to access his devil fruit power) or you can make a contract with another PC, whatever's more fun for you!