I think I got the problem resolved.
What had happened was I changed my Client to extend from EndPoint so that I can connectToServer with the client endpoint config argument to pass certain parameters. I had kept the @ClientEndPoint annotations as is. Perhaps I can't do both.
I'm now purely using the annotations.. I might come back removing the annotations to try out the other signature to pass the config, but will ensure to remove annotations and check it out.