Puppy is only potty trained for #2! Argh!

We have a 6 1/2 month old mixed breed puppy who we've had since she was 2-3 months old. She rarely EVER had accidents in the house, but we were diligent about taking her outside every half hour, then every hour. She was in a large "playpen" area (about 15 square feet) for enforced naps and never once had an accident there, or in the crate where she spends her nights. During the day, she would either be running around in the room that me or my husband were in or long-leashed to the living room coffee table at night when we were watching TV.

Since she's now almost 7 months, we decided to expand her territory. We gave her access to the hallway and one bedroom, plus she was allowed to be in the kitchen if we were in the living room (basically a big L).

She ALWAYS goes to the door and whimpers to go out when she has to defecate. ALWAYS. But she's very inconsistent with urination. Although she STILL goes outside at least once an hour, she will still go into the kitchen and urinate on the floor several times a week. We don't scold her, just clean it up and try to take her out more frequently.

How can we break this bad habit? I am SO tired of tripping over baby gates everywhere and I'm really motivated for her to be trained so she can roam free!

I'm paranoid because our last dog was NEVER potty trained. She'd been abused by multiple owners before we adopted her and she remained high strung and skittish her whole life (another 10-12 years). We worked with a trainer but we were never able to train her to do anything. She was just too anxious. DItto with the potty training…so we just committed to taking her outside every 2 hours…for years. She just never caught on and I don't want that to happen again!