View Draft Link from Node Edit Page and View Link on moderate page not displaying correct revision

Hi All,

I've scanned quickly through the ticket queue, though I didn't come across mention of this issue directly so I thought i'd pose my use case here. It's very possible the way workbench is working is the correct behavior, but here are a few user stories:

User Story 1:
As a content editor I want the ability to easily view the current revision I am creating/editing from the node edit screen .

There is currently a 'View Draft' button on the node/edit submenu, and it works great up until the point a piece of content is published. But as soon as a piece of content enters the published state, and you begin creating new 'drafts' , this 'view draft' button displays the current published revision. Shouldn't the behavior be to point to the current revision instead? So instead of something like node/[nid]/draft it should link to node/[nid]/revisions/[vid]/view ?

User Story 2:
As a content editor I want the ability to easily view the latest revision of the content being created from the moderation screen.

Again - this functionality works great up until a piece of content becomes published , but as soon as a piece of content becomes published the node/[nid]/current-revision link does not work as expected . Instead of showing the current revision, it displays the published content. Shouldn't the link here be node/[nid]/revisions/[vid]/view instead of node/[nid]/current-revision ?

Looking forward to your thoughts/opinions.