Help with DAX Group By ignoring visual filters

Hi all,

I am having trouble with a DAX formula.  I am trying to group some employee data together to calculate an average hourly rate when they have multiple positions, rank the hourly rate in descending order, and use this to split the data into four equal "quartiles".  This result would then be displayed split by the number of employees of each gender.  I think the issue I am having is because the filter from the visual is filtering the data before the calculation.

I am trying to keep this all within one measure to allow for dynamic filtering by various characteristics and position types that become grouped together in the calculation.

Currently this is what I have:

Q1 = 
VAR grouped_table =         
GROUPBY(
    fct_gender_pay_gap,
    fct_gender_pay_gap[snapshot_date_ref],
    dim_employee[Employee ID],
    dim_diversity[Gender],
    "Total Hourly Rate",SUMX(CURRENTGROUP(),fct_gender_pay_gap[hourly_rate]*fct_gender_pay_gap[fpe])
)
VAR added_columns = 
ADDCOLUMNS(
    grouped_table,
    "Rank Quartiles", IF(RANKX(grouped_table,[Total Hourly Rate] + ([Employee ID] / POWER(10,7))) / COUNTROWS(grouped_table) <= 0.25, 4,
                    IF(RANKX(grouped_table,[Total Hourly Rate] + ([Employee ID] / POWER(10,7))) / COUNTROWS(grouped_table) <= 0.5, 3,
                    IF(RANKX(grouped_table,[Total Hourly Rate] + ([Employee ID] / POWER(10,7))) / COUNTROWS(grouped_table) <= 0.75, 2, 1)))
)
RETURN
COUNTAX(FILTER(added_columns,[Rank Quartiles]=1),dim_employee[Employee ID])

This splits the data into 4 evenly sized quartiles, but if I split the data by gender it will give me 4 equal quartiles of males and 4 equal quartiles of females, which is not the desired output. 

Current result:

Desired result:

Below is a copy of my schema:

Any help would be greatly appreciated.

Kind regards,

Thomas.