Unsurprisingly, I went in for the in-store pickup and they had the DVD version waiting for me. After pointing out I ordered the Blu-Ray combo pack, it took them 20 mins to get me out the door with my copy.
No pushiness by the CS rep, except she said that the SKU was for the DVD version. I show her that it says the Blu-ray combo pack on my order printout. They finally get me processed by marking in the computer that I picked up my order (DVD), returned it for credit as a no receipt return (because I had a RZ certificate on it), and let me use the credit on the combo pack that they discounted to $14.99. They originally wanted to cancel my order and then have me buy the Blu-ray in-store for $14.99, but I couldn't use my RZ certificate since cancelling orders takes a day to clear (and thus a day to get my RZ certificate back). I said that was not okay as my RZ certificate was set to expire soon.
20 mins of my time, but worth it.