LOL you are absolutely right… this is the recommended way and you should definitely do that.
This is usually not a huge problem. You can increase the max tree depth by defining the nuts_kwarg={...} in pm.sample. Increase the number of tuning sample should helps as well.