It sounds to me like you need to stop guessing & bumping up your FTP but actually go out and test it. Personally, I prefer longer tests, take a look at this for an example:
Remember, some workouts should feel easy and not a slow grim death.