Advice on Devo Report

Hi all - i was looking for advice on a report i wrote that I now have to modify for v11.  We have a development snapshot that pulls individual giving and lumps folks into one of two categories - board (via constituent code) or membership level (by current memberhsip level).

Today's report looked off as logic in the program pulled giving, but households (which don't have the board consituent codes) started showing up in teh membership level giving, which made board giving go down and membership giving go up.

What's the best way to recode this so that individuals constituent codes will "affect" the household of who they're attached to?  going through t_affiliation or is there a better way?