Word: combining cross-references efficiently

I'm writing a long document in Word and from time to time need to reference to Figures. When I do so, I use the 'cross-reference' feature, which creates in-line dynamic links to my figures that read like this:

Blah blah blah, see Figure 4.2

In the event that I want to include two figures next to each other, this leads to a rather clunkly looking:

Blah blah blah, see Figure 4.2 and Figure 4.3

I would prefer to have the text read:

Blah blah blah, see Figures 4.2 and 4.3

This can be achieved by changing the 'field code' for each dynamic link which removes the word 'Figure'. I then just manually type 'Figures' before the references. For example, the field code might originally look like this:

REF  _Ref340509095 \h 

In order to remove the word 'Figure' from the in-line reference, the switch '\# 0.0' must be added to the code:

REF  _Ref340509095 \# 0.0 \h 

This works fine, except that the '0.0' specifies that the figure reference only has one decimal place. However, later figures, such as 'Figure 4.10' end up rendering as 'Figure 4.1', which is just plain wrong. If I change the field reference to this:

REF  _Ref340509095 \# 0.00 \h 

…Then my in-line references are rendered to two decimal places, but the earlier ones (figs 4.2 and 4.3) end up looking like this:

Blah blah blah, see Figures 4.20 and 4.30

My document actually contains a figure 4.20 already, so this is misleading. Whilst I could manually edit each of these occurrences to ensure that the correct number of decimal places is used in each case, this is laborious and not reliable. If, for example, I already have a figure labelled 4.9 and I later insert another figure above it, the 4.9 would change to 4.10, which would render at 4.1 unless I go back and change the reference.

My question is: how do I adjust the cross-reference switch so that it automatically renders the correct number of decimal places in the in-line text?