I vote for both!
As for the meaning of Calvin, I wouldn't be too worried about it. Most people don't ask or go around talking about the meaning of their names (other than the first few months maybe, when people are curious how you chose a certain name). I mean, when you meet someone new and they tell you their name, you don't ask "what does that mean?". IMO, meanings don't have much meaning

(My DD's name means "bitter" or "sea of bitterness", but who cares?).
PS I also LOVE Gilbert!