I think, based on what you already owned, OTG PM and NF is better too. Kirigami set like you said, already has 2 set…. A bit hard to find use for the 3rd set. But it would also have a representation of all the SS22 colours!! And honestly will be more for “looking” than “using”.
The midnight comes in papillon too. You said you don’t use NF that often and only wanted to get it because you wanted the midnight colour. I notice you are more of a small bag person from what I see from your collection that you post. Of course you may have more goodies that are big bags that I don’t see often too. Papillon might get more wear for yourself since it’s a small and cutie bag like what you usually post.

That said, NF is still a good choice because it has a “free” pochette inside for you to mix and match too!!
I’m sorry that I’m not much of a help!!