The restaurant you both are talking about must be 建新园 Jian Xin Yuan. Order and pay down below, but then you can eat your food upstairs if you prefer. Their 米线 mi xian/rice noodles and 过乔米线 guoqioa mixian/cross bridge rice noodles are always good, though they have other dishes as well. They have several branch shops.

Seems to me this place is better liked by locals than the higher profile chain of noodle shops with the red and blue signs which bear the name English name Brothers Jiang, actually 侨香园 qiao xiang yuan。

@Aum — Your massage requirements are too upscale for me. Can't help you there.