Conclusion: The proposal in the OP will be implemented, starting with the playtesting period for Kitsunoh.