How are the nights going? If your feeding routine is working for you at the moment I would leave it as it is to be honest. I know Tracy suggests combining the clausters by about 8 weeks, but BF babies do sometimes need to continue them for a while longer. I would be guided by him, if you start finding he isn't so hungry for that 5.30 feed then stretch him a bit, or you may need to adjust your feeds a bit so the 5.30 is a bit earlier so you get 3 hours between bedtime and the feed before (or what ever his normal feed interval is).
Laura