I would do 3.5dBi and 5.5dBi (round down to the nearest 0.5dBi). If you are US, you don't need to account for the diplexer loss unless you just want to as you shouldn't be anywhere near the regulatory limits (so 2.0dBi and 2.5dBi provisioned acounting for the diplexer loss).
Hope that helps.