I think 2 castles starting at 20 would be fine, but TheKeeper might have game notes that say it starts at 11 so I would wait to see what he thinks.
If we voted on it I would vote to keep multi castle hits at 11 or maybe just move up to 15. I'm not a big fan of farm-friendly changes.