Not sure I fully understand what you are doing but there may be an easier way - If I understand this right you want to be able to use Calendar year or Fiscal year at different points
you can make a copy of your day set the default date property on the copy to start the FY in October
Now each Calendar date is associated with a Fiscal date --
it would return something like this
If this posts assists in resolving the question, please mark it helpful or as the 'correct answer' if it resolves the question. This will help other users find the same answer/resolution. Thank you.