Using Columns with Multiple Subcategories in Pivot Table

Good day! This is my first using this forum, so I hope I am doing so appropriately.

I am attempting to create a pivot table that shows the count of 2 values per column. In my source data I have a list of partners as rows, and across the top there are multiple criteria that each partner either meets, or does not meet. Partners 1-5 can appear multiple times, but Criteria1-5 are always "Yes" or "No". This is shown in the attached file in the tab "Source".

My current solution to how I'm going to resolve this is shown in the appropriately named "Current Solution". Step 3 shows the end result I'm aiming to achieve.

I'd like to automate this entire process using Excel, however I can't seem to strike upon the right combination of fields in a pivot table. The closest I've got is in the "Attempted Solution" tab. This gives me the layout I want (or thereabouts), however I've noticed that the values for each partner duplicates - so for example in the lower pivot table of "Attempted Solution", Partner1 has a count of 31 in "No" for each criteria; when I validated this, this should be 31 for Criteria1, 24 for 2, 26 for 3, etc.

I know that there will be something really silly that I've overlooked or not set up properly on the pivot table, but I just can't seem to crack it after trying for a few hours! Any help that anyone can render would be greatly appreciated, thanks!

maybe this one. all is on source tab
done with PowerQuery aka Get&Transform and PivotTable

Aha, good solution! I think maybe I was obsessing too much about having both values, but really I suppose all I need is one at a time, like your table. Thanks for your help

You are welcome

If that takes care of your original question, & to say Thanks and for better Motivation, please

1. click on Add Reputtion (bottom left corner of the post of the person(s) who helped you)
   then
2. select Thread Tools from the menu (top right corner of your thread) and mark this thread as SOLVED.

If you did it already - ignore it.
Thank you.

Have done! Thank you again.