Since you have an extra draft pick (traded away your #2 but gained KD's 2nd and Bubba's 3rd) you can still drop 3 and draft 4 players to bring your roster to 40.
Greg Maddux (despite his stellar performance as pitching coach)
Tony Abreu
Jarrod Saltalamacchia
As for the set, I prefer the expanded. I have obvious selfish reasons, but the fact is the draft was held early, and questions about player eligibility obviously effected the draft.