Everyone's injury and illness is different. I cannot say how long it will last; I only wish it will be gone in time for your cruise. It sounds like it is improving, so this is a good sign. You may still have a little discomfort on the cruise, but try to have a good time.
You may want to avoid lifting the suitcase(s) or anything heavy to avoid re-injuring it.
Have fun on your cruise!