If this is related I'd rather have dragoon as it is now, then dragoon with a wyvern pet.

You hit harder and you don't have to worry about managing a pet. Big numbers are fun \o/