Circular dependency questions with measures

Currently having an issue where 2 measures are creating a circular dependency.

I have a feeling it's because one of the calculations invole a filter. I tried using both measures (where te circular dependency is happening, as well as filters)

Sample data is as follows:

The Output data should be as follows:

Formula wise in PowerBI

I used the measures 

% of Prop = 

DIVIDE(
  (DIVIDE(
    CALCULATE(
     SUM('Input'[Value]),
     'Input'[Group]<>"Exclude",
     'Input'[Type Cost]="Add Year"
     ),
    1000
    ))
 (DIVIDE(
    (SUM(Data'[Multiplier]) * SUM('Data'[TOTAL Prop])
     ),
    1000)
    ))
)

% of Rev =

DIVIDE(
(DIVIDE(
    CALCULATE(
     SUM('Input'[Value]),
      'Input'[Group]<>"Exclude",
      'Input'[Type Cost]="Add Year",
      'Input'[Type]="Non-Recoverable"
     ),
    1000
    )),
(DIVIDE(
    (SUM('Input'[Multiplier])*SUM(Input[TOTAL Rev]) ),
    1000)),
)

I have uploaded the files onto dropbox.