Partly. You have filled in the detail
@dduelin about the mountings - thank you. You can get a good idea by looking at the swing arm pivot bolts. Although the shop manual addendum for the Uk is aimed at 2002 and 2003 models, and implies 2004 all have the new hardware. However, I have seen 2004 models over here with the earlier setup. ( And they were the 2004 model with the ST1300 A4 label and the correct colour red for that year, rather than just being 2004 registered) . So I am unclear about what happened and when. Hence my suggestion of going for 2006 and later. There was no 2005 model in the Uk.