You've gone from ridiculously underweight to just very underweight. Progress is progress.
Nutrition is obviously the priority, but what's your current training plan?
What are your best lifts in the squat, deadlift, bench press, overhead press, pulldown/pull-up, and row?
I think the "massgainer" is what's screwing you up. Not that you don't need plenty of calories, but I think your whole food meals can be tweaked to be even better. For example, if your numbers are right, you're on a pretty low fat diet. That's a problem.
Also, your occupation is listed as "dock hand." I'm presuming that involves a lot of manual labor? If so, we definitely need to account for that activity and eat accordingly.
Try basing four good meals a day around the foods in this article:
Like Kakno said, these numbers just don't mathematically add up. What brand name is this gainer?