Yes ive been using the 36-034, perfect so far but some wagons have smaller wheels as noted from the Bible. I see what you mean about the brake shoes - they may have to go. Yes they are same tf25 you have. But better than building white metal ones.
I may try some 8mm wheels from Genesis kits, a bit expensive at 8pound for 4.