That is a question I spent waaay too much time on in the past. XD As stated in your question, yes I would - but I’ve come to the conclusion that you can’t bulletproof your other wishes by using a wish, because: (continued in next post)

1. Your bulletproofing wish can be twisted. 2. Interpretation is inherent to language, as any legal professional will admit. 3. Giving you exactly what you want is also a great way to mess with you. Therefore, I’m of the opinion that the best way to not get worked over is working *with* the genie.