Hi Max.
I'm not getting involved in your rebuild as I don't use sound or any fancy gimmicks for me it's all DC all the way but that's me and I never knock anyone else for living in the present!
I have been involved in O Scale for many years getting close to 30 years maybe, who's counting, and I am a bumbling modeller who gets by on my average skills.
I have many Weaver and Red caboose diesels some run great some don't for the operation day I don't like hassles so I run a fleet of six Atlas SW diesels and never have a problem.
Anyway enough self praise that's not what I am writing about.
Loco Rollers: This is what I use they are from Mustard Models in England I go every year to England and always go to Telford for the O gauge show which is the biggest same Gauge show in Europe so I'm told not much USA items but plenty of tools and stuff like this.
Maybe you should ask an old O scale bloke sitting down in his workshop at the end of the earth before buying equipment in the future I can give you O SCALE advice but's that's all, I am not an expert and I am not a dealer just an old man playing with his trains.
Nev.