calculation item from calculation group not working correctly

hello

i have a problem with the correct dax formula for the calculation item that i need;

i have a source tableA; this table contains records of actuals and budget (RecordType); i have 6 other columns in that table: date, budgetCode, BudgetModel,PeriodType, Measure1, Measure2; 

records with recordType=Actuals have hard coded values for budgetCode and BudgetModel (-2);  Records with recordType=Budget have hard coded values for PeriodType (-2); BudgetModel should be hardcoded in the calculation item to 'Final'

in the model i created a measure Measure1/Measure2;

I created a calculation item with the below logic:

Forecast=

VAR SelectedBC = SELECTEDVALUE('Budget Code'[Budget Code])

VAR R39 = CALCULATE(
SELECTEDMEASURE ()
, 'Date'[Month nr] IN {1,2,3}
, 'TableA'[Record Type] ="Actuals"
, 'Period Type'[Period Type] ) <> "Closing"
, REMOVEFILTERS ( 'Budget Code' )
, REMOVEFILTERS ( 'Budget Model' )
)

VAR R66 = CALCULATE(
SELECTEDMEASURE ()
, 'Date'[Month nr] IN {1,2,3,4,5,6}
, 'Table'[Record Type] ="Actuals"
, 'Period Type'[Period Type] ) <> "Closing"
, REMOVEFILTERS ( 'Budget Code' )
, REMOVEFILTERS ( 'Budget Model' )
)

VAR R93 = CALCULATE(
SELECTEDMEASURE (),
'Date'[Month nr] IN {1,2,3,4,5,6,7,8,9},
'TableA'[Record Type] ="Actuals"
, 'Period Type'[Period Type] ) <> "Closing"
, REMOVEFILTERS ( 'Budget Code' )
, REMOVEFILTERS ( 'Budget Model' )
)

VAR SelectedActual =
SWITCH(
SelectedBC,
"Reforecast 3+9", R39,
"Reforecast 6+6", R66,
"Reforecast 9+3", R93,
0
)

VAR SelectedBudget = CALCULATE(
SELECTEDMEASURE ()
,'Budget Code'[Budget Code] = SelectedBC
, REMOVEFILTERS ( 'Budget Model' )
,'Budget Model'[Budget Model Code] = "Final"
, REMOVEFILTERS('Fiscal Period Type')
,'TableA'[Record Type] ="Budget"
)

VAR Forecast = SelectedActual+SelectedBudget

Return Forecast

this give the correct result if i just drag Measure1 and Measure2 into the visual; but it dont work correctly for Measure1/Measure2;

Instead of (Actuals measure1 + budget measure1)/(actuals measure 2 + budget measure2) it gives me actuals measure1/measure2 + budget measure1/measure2

i understand the issue is in the calculate being used separately for two different data sets;

so i was trying to combine the records under 1 data set with combined filters for both actuals and budget;

however im unsuccessful in getting the right code

i tried many different versions of the code, here is one of the last trials:

version0

VAR SelectedBC = SELECTEDVALUE('Budget Code'[Budget Code])

VAR NMonths =
SWITCH(
SelectedBC,
"3+9", 3,
"6+6", 6,
"9+3", 9,
0
)

VAR MonthsForActuals = GENERATESERIES(1, NMonths, 1)

VAR Forecast =
CALCULATE (
SELECTEDMEASURE(),
// Remove external page/slicer filters that were killing your rows
REMOVEFILTERS ( 'Budget Code' ),
REMOVEFILTERS ( 'Budget Model' ),
REMOVEFILTERS ( 'Period Type' ),

// Apply your OR logic as a single table filter with row context
KEEPFILTERS (
FILTER (
'TableA',
(
'TableA'[Record Type] = "Actuals"
&& RELATED ( 'Date'[Month nr] ) IN SELECTCOLUMNS ( MonthsForActuals, "Value", [Value] )
&& RELATED ( 'Period Type'[Period Type] ) <> "Closing"
&& 'TableA'[BudgetCode] = -2
&& 'TableA'[BudgetModel] = -2
)
||
(
'TableB'[Record Type] = "Budget"
&& RELATED ( 'Budget Code'[Budget Code] ) = SelectedBC
&& RELATED ( 'Budget Model'[Budget Model Code] ) = "Final"
&& 'TableA'[PeriodType] = -2
)
)
)
)
RETURN
Forecast

another trial was this:

version1

VAR SelectedBC = SELECTEDVALUE('Budget Code'[Budget Code])

VAR NMonths =
SWITCH(
SelectedBC,
"Reforecast 3+9", 3,
"Reforecast 6+6", 6,
"Reforecast 9+3", 9,
0
)

VAR MonthsForActuals = GENERATESERIES(1, NMonths, 1)

var CombinedFilterTable =
FILTER(
'TableA',
(
'TableA'[Record Type] = "Actuals"
&& RELATED('Date'[Month nr]) IN SELECTCOLUMNS(MonthsForActuals, "Value", [Value])
&& RELATED('Period Type'[Period Type]) <> "Closing"
)

||
(
'TableA'[Record Type] = "Budget"
&& RELATED('Budget Code'[Budget Code]) = SelectedBC
&& RELATED('Budget Model'[Budget Model Code]) = "Final"
)
)

var Forecast = CALCULATE(
SELECTEDMEASURE(),
REMOVEFILTERS('Budget Code'),
REMOVEFILTERS('Budget Model'),
REMOVEFILTERS('Period Type'),
KEEPFILTERS(CombinedFilterTable)
)


Return Forecast

but none of these versions are working - in both versions 0 and 1 actuals part are missing from the final result; in the report itself i need to be able to add the filter on budget code (this is determining how many months of actuals the measure will cover) and any filter on budget model or period type should be ignored by the measure (these are hard coded in the measures too); any other filters like e.g. on date should be applicable though (e.g. on year)

i would appreciate any tips on how to get this done;

thanks!

rgds