Our 3 month old has started sleeping less and less as well. He sleeps through the night but will only have catnaps of 30 mins to 1 hour maybe 3-4 times a day. I've read lots of posts from others saying this is fairly normal - which is reassuring. We had to take Lincoln out of his bassinette at 2 1/2 months because he was too restricted in it. Since being in the cot he can sometimes put himself to sleep at night and sleep through. Could be coincidence though. But I'm pretty sure he likes it more in the cot. More fresh air can circulate as well - especially now that it's heating up. As far as sleeping in our room - we only lasted one night because he was such a noisy sleeper (we couldn't cope). It helps us to get a better night's sleep as well.
Good luck when you make the move to the cot. Do it when you feel ready. It's all trial and error (for us anyway because we're first timers).