I moved my bottles with Shimano Di2 cage adapters - seat tube down so a 25oz bottle cleared my frame pump, down tube up to clear the lower seat tube bottle. They include optional spacers so you can even clear a clamp-on front derailleur.
http://www.amazon.com/Shimano-Dura-A.../dp/B005J39YWI
Sunlite makes a similar product, but it isn't as attractive.