Please check out the solution I just posted below to a very similar question. I think the general approach laid out below should be fairly easily adaptable to your scenario:
If you still have problems after trying this, please post a PBIX file along with a mockup of your desired outcome, and we can work through a more specific solution.