10 team roti, one year (but if year isn't played we carry 5 keepers into next season, then play for one season)

G, A, +/-, PIM, SOG, PIM, PPP, SHP | W, SV%, GAA, SO

Start 2C, 2LW, 2RW, 1F, 4D, 2G.

I want to upgrade my RW (currently L. Eriksson, Selanne, R. Callahan) and I think I have depth to deal from on D (currently Byfuglien, Subban, Boyle, Schultz, Wideman).

I want to get Seguin, and the other GM has his eyes on Subban. My concern with dealing Subban is that my team's going to be light on PIMs as it is.

Looking for advice - do I put a package together, swap some players off of waiver, or stand pat?

If I packaged, it would probably look like:

My Subban + Callahan for his Seguin + Salo (then dropped)

Some notable FAs available right now:

RW - Voracek
RW - Purcell
RW - Ryder
RW - Horton
RW - Jagr
RW - Doan

D - Wisniewski
D - Carle
D - Hamonic
D - Kulikov

So, am I better off with Callahan + Subban or Seguin + [waiver], or are there any upgrades you see on waivers above my RW?