hj1981- We have a pretty small house too so I am getting this swing called a 'Little Tikes 2 in 1 Snug and Secure Swing' (google it to get a picture). It's probably suited from about 5mths to 4-5yrs and can be attached to anything ie the clothes line etc. I was going to get an electronic baby swing but they are quite expensive and don't last long. We used to have one of these swings at the childcare centre I worked at and it was great, pretty cheap too.
You are not doing anything wrong in regards to sleep and you're probably right about the teen thing. Also at this stage I don't think any of us should speak to soon as our babies may turn around tomorrow and decide not to sleep anymore! They are very unpredictable creatures.
Someone mentioned the $1000 from K-Rudd, I was pretty spewin that we missed out by like 3 days, oh well.