Travel Form / Flight Form Merge

Is there a way to un-merge these spells?

I really really dislike the merge of the travel/flight forms.

Beyond the less-than-purely-practical ability to shift into stag form wherever I please:

If I'm in combat, and shift into travel form (shifting me into a stag), in order to switch into flight form when out of combat, now I have to click out of travel form, then re-cast travel form to switch to flight form.

With the old system, I could switch directly from one to the other at will.

I also share the common complaint that I'd like to be able to shift in to stag form whenever I would like.

The whole merger is unintuitive and just plain not fun. Part of the fun of being a druid is choosing what form to shift into.