Did the Partridge Family have a song called One Step short of our heaven that was featured in an episode where they were at an amusement park?

Did the Partridge Family have a song called One Step short of our heaven that was featured in an episode where they were at an amusement park?
Yes, the song was called "Together We're Better." It is on their CD "The Partridge Family Notebook." I can't remember if the episode was at an amusement park, but I think actress Season Hubley was in it.