My opinion is that the electric choke is the best option:
1. It's automatic
2. It's only one wire (whereas the water choke is two hoses)

However, a lot of folks prefer the manual choke.

You should keep the water choke mechanism stock. It's designed to work a certain way, I imagine the restriction is important to its operation.