This is a difficult tune to solo, although it might not be evident.
Obviously you are starting out.
So main thing you need is more chops. That from the vocabulary side.
The other thing is, besides listening to the original with Max Roach listen to other versions (example: another famous solo is with Steve Gadd - faster ´though), plus listen to drummers playing Calypso Grooves with Jazz Orientation (example Al Foster), the last specially to see if you can find a basic rhythm that might feel more at home (I don´t think you have to change the one you are playing,
sounds fine to me, I want to say if you are looking for INSPIRATION to play something else ONLY).
Now, when you listen to the solo (which is exactly the way you did it, with no support from others) analize how to get "in and out" avoiding playing the rhythm and back to it, that´s also very important reason to have a basic rhythm not even a hurricane could make you stumble when you come back to it.
See how much you can get out without loosing not only YOUR sense of the tune/rhythm/melody but also the sense you think A LISTENER would have of it, I would say also keep the 16 bar frame of the form too (perhaps sometimes "quoting" the four quarters of bar 15 as reference?).
Your solo went like this 1 Form (16 bars), 8 Bars (you looked to the saxophone player - you ended your solo there or at least just kept time only untill the end), 8 more bars (end of second REAL form), saxophone player waited 8 extra bars to get in (???).
Have a look to my page http://www.alexsanguinetti.com , there is an English section in it, watch the videos, please.
Best regards!