Interaction with iCloud/Photostream

[Eas]

How am I supposed to deal with photostream on iOS 5? It seems like if I have photostream enabled and disable EyeFi uploads from my phone, then photos that got to my phone from my camera over a direct-mode connection could end getting transferred before they get geocoded, and I'd miss out on EyeFi's ability to automatically uploading to online services. If I leave EyeFi uploads enabled, then I could end up with duplicates.