Question About Sorting After Adding Zeros to a Power BI Matrix

[MNPowerBiUser]

Greetings, 

I am a fairly new user to Power BI (about 6+ months) and I am at a crossroad.  In playing around with Power BI, I have learned how to order my matrix to match my fiscal year AND how to add zeros to a blank entry in a matrix.  What I have not been able to do is find a way to display both of these at the same time. I can create a matrix sorted nicely  or with zeros (dashes) but not both: 

I found how to do the sort trick (which works great) and it is utilized by creating two new columns in my data table:

AND

The replace zeros measure I am using is: