Manually annotate multi-unit parts

I've done a quick search but cannot seem to achieve what I want.

Suppose we have a schematic layed out with a given IC used multiple times which has two units.

Picture worth a thousand words: http://imgur.com/RH751uy

I would like units S and T to form one IC, U and V to form a second, W and X to form a third and Y and Z to form a fourth.
In other words, I would like S to be, say, U1A, T to be U1B, U to be U2A, V to be U2B, W to be U3A, X to be U3B, Y to be U4A and Z to be U4B.

However, when using auto-annotate, you have to choose either X or Y numbering. Incidentally, the little graphics are the wrong way around (X should be "Z" numbering, Y should be "mirrored N" numbering).

This forced X or Y-axis numbering breaks / splits how I would like them. For example, S and T are together (as I want), but U and Y are then grouped together as one IC, and V and Z are grouped together as another IC.

From what I've tried, it looks like there's no way to manually annotate them to work around this issue.

So is there a way to manually annotate them / force the grouping of multi-unit parts or should I put in a new feature request to see how this can be resolved?

edited to add that currently, I can kind of work around the problem by dragging entire areas of the schematic to one side so the auto-annotate numbers them how I want. But when you have complex schematics, this isn't really possible!