I don't mind either 2♣ or 2♥ (but certainly not 2♠ as it's GF). If partner has 31(54) a 2♣ rebid will encourage him to a 3♣ invite more favourably than a 2♥ rebid will for a 2NT invite. With 3244 then either rebid should be fine. In terms of partscore however I feel hearts would play better than clubs will given our suit quality. Over our 2♣ I don't think it's likely at all that partner will be bidding 2♦ or a preference to 2♥ given that he thinks that we have located a fit, and in addition to that there's a small fear that if LHO competes to 2♠ over our 2♣ we may be stuck for a pass if partner competes with 3♣ and we might find ourselves in a 4-3 fit. Given our system, if it is expected that 2♣ may include these types of problem hands then I obviously bid 2♣. As for the 2nd auction, I would have doubled 2♠ to show extra values. Having failed to do so I now make the strange looking bid of 3♠.