You've got some of the basic ideas correctly identified but several of the details need to be adjusted.
First, if your instructor is ok with you using H+, then use it. But since H+ does not exist in solution, most instructors would usually prefer the use of H3O+. Anyway, just use whatever your instructor wants you to use.
The first stage of the reaction is a simple acid-catalyzed hydrolysis of an ester. Which oxygen is more basic in an ester?
The second stage, is an elimination. First, look carefully at the arrows that you drew for the elimination: they do not result in the formation of the desired product and, for that matter, are simply incorrect and impossible. Once you've figured out better electron-movement arrows (so which hydrogen needs to be removed?), then you will want to adjust your mechanism to include the formation of a dienol before kicking out H2O.