Ok. Option 1 sounds good for now. My interpretation of the docs though says that the short version should be 0.20.0 and the CFBundleVersion would be only our build number, e.g. 5672.

http://developer.apple.com/library/ios/#documentation/general/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html#//apple_ref/doc/uid/TP40009249-SW1