Ok, based on the comments I've removed the change to Aby's warlocks.
As far as maps go, the main candidates I've come up with are
Streamlands and
Land of Ethereal Squirrels (both wraparound). Streamlands has played well in CF 3, while LoES will provide a nice average of 13 provs/player as well as 13 water provinces to fight over.