Matrix Visualization with dates both in rows and columns

Hi all - 

I am trying to create a visual as follows. So far I have tried using a matrix but it is not working properly because it has dates both at the columns and the rows. 

My current data is something like this:

I have 2 measures, one that counts the shipments by the "Ship Day" column and another that counts failures by the "Failure Reported Date". I have a Calendar table that has as primary relationship to "Ship Day" and as a secondary relationship to "Failure Reported Date". I use the calendar field to the matrix visual as rows and column and add "Shipments" and "Failures" measurements as Values. When I do this at the top, it does not separate by year. Right now it is looking something like this:

I need to create something similar to his format:

Is there a way to achieve this?