I'm definite on HR Puffnstuff, not sure about The Bugaloos, but I believe they were both separate shows.

However, the Banana Splits also showed some old HB shorts like the Octopus who lived at a Sea World type resort etc (can't remember the name at the moment)