We ended up using mostly EBM bottles for the first 6 weeks or so, since bub wouldn't drink enough before falling asleep.
Bad singing helped keep him awake, but I also used water drips, ice-cubes, no clothes (but this was in March, not June!). It did improve hugely as he got a bit bigger and stronger.