It really seems like you ought to include some of the stronger draws such as:
Flush Draw + OESD + Pair
Flush Draw + OESD/Double Gutshot
Flush Draw + ISD + Pair
Flush Draw + 3Straight + Pair
OESD+Pair+BD Flush Draw