FY Calendar Reverting to CY

I am trying to associate a FY calendar with imported data brought in on an Excel sheet.
I am using the following formulas to create my FY Calendar Table (FY starts in Oct):

Column 1.)

Calendar = CALENDAR(DATE(2018,10,1),DATE(2030,09,30))

Column 2.)

Month = Format('Calendar'[Date], "mmm")

Column 3.)

Month Sort Order =
MONTH(EDATE ('Calendar' [Date], -9))

Fiscal Qtr =
"Q" & CEILING(
MONTH(EDATE('Calendar'[Date], -9)),
3
) /3

Column 4.)

FY =
VAR CY ="'" & RIGHT(YEAR('Calendar'[Date]),2)
VAR LY ="'" & RIGHT(YEAR('Calendar'[Date]) -1,2)
VAR NY ="'" & RIGHT(YEAR('Calendar'[Date]) +1,2)
VAR FiscalYear =
IF(
Month('Calendar'[Date]) >=4,
CY & "-" & NY,
LY & "-" & CY
)
RETURN
FiscalYear

I then ensure that both date formats are the same and mark my FY Calendar table as a Calendar.

As I bring my Excel data date into a new table, I get the columns I have asked for (Year, Qtr, Month, Day) however it is reverting back to Calendar Year and not the FY Calendar I created.

Then when I create a Relationship between the two dates, I loose the FY format.

Any assistance would be creatly appreciated