So I finally made it down to the Sunterra Village Marche on "Butter Chicken Day" at the Big Pan counter. Turns out it's every Thursday, but I seem to go there every other day of the week.
And after all that waiting, it was just ok.
They claim "World Famous" status on their Butter Chicken, and I have to admit, the chicken and butter sauce were very good. The two problems were the starches - the dry flavoured rice underneath which only served to soak up my precious sauce, and the terrible naan bread, which more closely resembled undercooked bannock than naan, and it was cold and stiff. yuck.
If there's any way to get the Butter Chicken on its own, then pick it up for dinner and go to one of the many Middle Eastern bakeries to pick up fresh, real naan to go with it!