Hi Neene,
If the cluster feeding is working for your lo, I would not stop it at this stage. A lot of people continue to clusterfeed until they introduce solids.
If your lo is taking these feeds well, I would carry on with them - let him be the guide - if he starts refusing it, then you know it is time to stop. You want to make sure that they are taking the majority of their calories during the day, as this will eventually start eliminating the night wakings.
Hope this helps.
Paula