After looking over this map I decided to add this to my bot server, so I also edited the map to support 16 vs 16. I'll contain that in the zip as well in case you want to use it. Just note that somethings are removed in my map like smokes and awps.
I hope this is waypointed good enough for you, let me know if there is any problems I can fix them.
http://www.filefront.com/15084435/fy_waterarena.zip