I like both names you have. I would prefer the second spelling in both cases.