C.S.
Be sure to let us know the turn out because I'm having a similar problem - my son also has starting battling naps since the big boy bed but does fine at bedtime. I've treatened to put him in the pack-n-play "baby bed" one day and that back fired- he said "ok". So I've been setting up the pack-n-play for naps- I work so this is just a weekend thing. It's not ideal but better than the alternative of no nap. This option may also be better for you than the living room option because I'm sure your activies (like vaccuming) are limited. He does sometimes still fuss in the pack-n-play but since he knows he is confined he settles down pretty quickly.