Re: milk supply question
Whether or not your supply stays high depends on the baby's needs post-growth spurt. If he needs more milk, he will maintain a higher supply by either a) feeding more frequently or b) draining the breast more completely at each feeding. Honestly, it's more likely that if he needs more milk he'll feed more often, so if you got used to a certain feeding frequency now is probably the time to let go of the idea that your baby will eventually go back to it. He might, but he might not.
If you are staying home with your baby and feeding on demand, there's no need to be mucking around with the pump. You don't need to completely drain the breast at every feeding. You can just rely on your baby to drain the breast as thoroughly as he needs to, and to boost supply by increasing his nursing frequency if he needs more milk. If it were me, I'd put the pump on the shelf and stop stressing.
Coolest thing my big girl said recently: "How can you tell the world is moving when you are standing on it?"
Coolest thing my little girl sang recently: "I love dat one-two pupples!"