Oh, dear! I'm not sure what to do!

My previous yorkie HATED Frontline. She would freak out for about an hour after the application, rolling around and trying to get it off her. My current vet said that fleas are showing resistance to it now b/c it's been around for about twenty years. I've heard the Comfortis can upset their tummies. What do you use for fleas and heartworm?