Filter using custom date options

Hi,

I want to create simple slicer which includes custom date options, such as:

I know I can use a Relative Date Slicer, but I would like to keep my filter really simple if possible.  I am sure this has been done before but I seem to be going around in circles looking for a solution.

The approach I have started is to create my own DateControl table, with one row per date and columns for each custom date option:

And I have created a relationship from this to my main table, joining on date.

I have then created a third standalone table, simply listing the different categories, which my slicer points to:

I was trying to following this guide, which create a cusom measure, but I can't get it to work.  From what I can tell, it will select the records with the maximum value from the column appropiate to what has been selected in the filter.  So in my case, if I select 'This Month', it will select rows from column DateControl[This Week] where the value is 'Y.  

I have also tried updating my measure to use the following code, but still the report does not change when I select from the filter:

IF (ISFILTERED ( DateOptions[Category]) && HASONEVALUE (DateOptions[Category] ),
 SWITCH(LASTNONBLANK (DateOptions[Category], 0),
 "This Year", MAX(DateControl[This Year]),
 "This Month", MAX(DateControl[This Month]),
 "This Week", MAX(DateControl[This Week]),
 "Last Week", MAX(DateControl[Last Week]),
 "Yesterday", MAX(DateControl[Yesterday]),
 "Today", MAX(DateControl[Today]))
 BLANK()
)

Any help or suggestions greatly appreciated!

Mark