Yeah that's the place I went to. Just be aware of the opening times as they vary but Sunday after 11am or 12 is when most will open. There is a couple of places at Bugis Junction that are pretty good but I cant think of the name of the store
Also I found the airport toy stores were pretty good for prices but again shop around and look at the two or three there.