There’s no such thing as 5V PD unless you mean 5V 5A, fyi. PD is an optionally supported standard of USB-C and the resistors are not part of PD, just the standard USB-C spec.
You're right, I guess I might as well just get some straight breakouts for a USB-C for the 5V case, but then I'll be limited to half an amp, which is probably fine for my uses, I guess.