You might look at Syncrossus Helodes, the Banded Tiger Loach.
They grow fast & are probably tough enough to hold their own against the Puffer.
Speaking from experience, Banded Loaches are very efficient scavengers, but can be extremely aggressive towards tankmates.