I'm new to all this stuff, but 1:1 for Citi points sounds good? But remember Etihad points have an expiry.
"Start dreaming about everything you could do by earning 20% more Etihad Guest Miles. Perhaps you’d like an upgrade on your next holiday and the perfect accessory from our Reward Shop? The sky is the limit if you convert points from your bank, hotel or favourite loyalty programme into miles before 31st October, 2016."
FYI - Appears to only be for Citi Prestige & Citi Diners holders only.