Queens street address translator or index?

Hi! Trying to find the current address for a car dealer location, “Cornelia Garage & Repair”, long out of business. A 1930 document lists the address as 2319-25 Cornelia Street, Ridgewood. I’m trying to figure out just where on Cornelia this was. Cornelia Street doesn’t cross numbered roads, making this harder than usual.

I -think- Cornelia Garage was at the corner of Cornelia and Wyckoff Streets, as the building that was there (demolished c. 2015) seems to be the closest building that could handle both car repair and new car sales on Cornelia. Cornelia Garage sold Willys-Knight and Whippet automobiles in 1930.

2014 Google Street Maps photo: https://maps.app.goo.gl/jhX1oT82AMCyuFeQA

2018 Google Street Maps photo: https://maps.app.goo.gl/rcqtqbh4Ybk8LCJR7. Google Maps lists this as having a Wyckoff Street address.

Thanks for any tips!