I also dont like flat benching,
but you are better to start off with flat flyes then jump to the 30 degree incline ( superset )! I would just change the flyes to flat......too much for upper. The dips are great, keep them!
That superset is great........you will reduce you shoulders and triceps from being too involved....if that is your problem! If you choose not to try the superset, then drop the incline flyes to a flat flye!