We seem to agree. Christianity is not the Puritan fear that somebody, somewhere, might be having fun, but neither is it just a happy story with a cartoon ending. God does ask more of us than that we just do what we feel like, but He wants us to enjoy following his will and to have fun doing so.
Actually, Puritans did NOT believe having fun was a bad thing. Not at all. They have just been painted with a false brush by those who were not believers and others just assume what they hear is true.