WYSIWYG: Media button & CKedit Image button inconsistency

When inserting images to be floated left or right using the WYSIWYG Media button, I have to use the WYSIWYG Image button to adjust certain attributes of the inserted image (e.g. float the image to the left or right). Clicking the CKedit align (left, center, right) will align the image, but the text will not wrap. Here is an example workflow:

1) Click the Media button on the WYSIWYG editor (CKedit in this case)
2) Upload a new image
3) Submit the image so it is placed in the WYSIWYG area
4) Click the Image button on the WYSIWYG editor
5) Change the alignment, alt text, link, etc

One possible approach to reduce the number of steps here would be to merge the media button into the Image button, or conversely to merge the functionality of the Image button into the Media button.