I do not think this is needed. Cities already are easy to take without giving any unit a bonus to take them. Also by giving a bonus in no way does that make Infantry defend them any better. By making Cavalry worse at taking cities you are making Infantry better, no need to double that up.
As for terrain modifiers I believe you want to do away with the -33% in open terrain, but keep the modifier for swamp/marsh.
Does anyone know if Cavalry get the -33% modifier for open terrain? Since they do not get defensive bonuses, I was wondering if all modifiers on terrain are considered bonuses, and the one for open just happens to be a negative one. As I never see AI cavalry I have not had a chance to test this to see if they do or do not.