They both are nice personal spaces considering the Go Fish apartment does reward you a Underwater Apartment for catching all of the fish there. As far as fixing the fishing game I have not played it since but if you like i can show you all three apartments and you can choose from there. Just send me a friend request. I would be happy to help you out.
I was trying to decide the same thing months ago. I went with the Waterfall Terrace because I liked the scenery. The fishing game there is ok but I heard the game at Go Fish is better. I plan to get that one someday too.