I agree, the adjacent production needs to be dropped. I'd like to see the adjacency bonuses dropped all together. Instead, give it bonus production/ culture for each adjacent water tile. It would make settling small island chains more appealing.
This is pretty much exactly what I've proposed before. It would also allow us to drop the extremely ugly ability to build Moai on resources.