Yea mine was a one piece like yours with clear window. And I done exactly as you said. Mine wouldnt come out so I removed the intake popped it out. Spliced in the the harness. Scoped it and home I went. Login to read more.