Well I do note one more 50% bonus that you may not be thinking of. Guerrilla. If your civ borders the city and you are attacking from your side of the "fence" wouldn't you receive another 50%? Or does that only count for the square you are attacking?