I think I'd recommend the [words=https://officialhydromaxpump.com/?uid=6&oid=2&affid=98 ]
bathmate[/words] [words=https://officialhydromaxpump.com/?uid=6&oid=2&affid=98]x50[/words] for you. And you could use it as an airpump if needed if you get the [words=https://officialhydromaxpump.com/?uid=6&oid=2&affid=98 ]xtreme[/words] model, but may want a
sleeve around your unit.
The nice thing about the water pumping is that you need wayyyy less time than with air pumping. And yes you can do it in the shower and don't have to actually fill up a bathtub. Even just 2-3 5 minute sessions is enough. Also way less fluid build up. With air pumping, it's easy for the penis to get 'spongy' and then she'll definitely know something is up.
(Tho if you over-do it with any pump, you can get fluid build up).
I'd either get the [words=https://officialhydromaxpump.com/?uid=6&oid=2&affid=98 ]xtreme[/words] model, or a wine vac to help suck more water out.
Congrats on your progress so far! I'm excited to see you get to 10"!